Replace AM_ variables with OMK_ ones

diff --git a/doc/omk-manual.texinfo b/doc/omk-manual.texinfo
index b3f60d434155e454f0ce5a2795e19efb8dbc7658..dcd81028de19c1a33f24be7cea6e07c53c08ea8f 100644 (file)
--- a/doc/omk-manual.texinfo
+++ b/doc/omk-manual.texinfo
@@ -370,17 +370,17 @@ source @file{test.c}.
 
 @defvar xxx_CFLAGS
   CFLAGS specific for the compiler program. If this variable is set, its
-  value efectively overrides the value of AM_CFLAGS variable.
+  value efectively overrides the value of OMK_CFLAGS variable.
 @end defvar
 
 @defvar xxx_CXXFLAGS
   CXXFLAGS specific for the compiler program. If this variable is set, its
-  value efectively overrides the value of AM_CXXFLAGS variable.
+  value efectively overrides the value of OMK_CXXFLAGS variable.
 @end defvar
 
 @defvar xxx_CPPFLAGS
   CPPFLAGS specific for the compiler program. If this variable is set, its
-  value efectively overrides the value of AM_CPPFLAGS variable.
+  value efectively overrides the value of OMK_CPPFLAGS variable.
 @end defvar
 
 @defvar xxx_GEN_SOURCES
@@ -516,15 +516,15 @@ and what is their destination file name.
 @section Compiler Flags
 
 OMK follows the same philosophy for flag variables as does Automake. The
-variables with AM_ prefix (e.g. AM_CPPFLAGS) are supposed to be used by
+variables with OMK_ prefix (e.g. OMK_CPPFLAGS) are supposed to be used by
 the package developer and variable without that prefix (e.g. CPPFLAGS)
 are reserved for the user. The following
 
-@defvar AM_CPPFLAGS
+@defvar OMK_CPPFLAGS
 Preprocessor switches.
 @end defvar
 
-@defvar AM_CFLAGS
+@defvar OMK_CFLAGS
 C compiler switches.
 @end defvar
 

diff --git a/snippets/gcc.omk b/snippets/gcc.omk
index 142fdb8a72b7dc939b96abb82722c6f12e54e51a..9a34c3ae0aa961ca627a9edc6c77a3906577dcba 100644 (file)
--- a/snippets/gcc.omk
+++ b/snippets/gcc.omk
@@ -64,14 +64,14 @@ SOURCES2OBJSLO = .lo/.c .lo/.cc .lo/.cxx .lo/.S .lo/.lo
 #%.lo: %.c
 #      $(CC) -o $@ $(LCFLAGS) -c $<
 
-c_o_COMPILE = $$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $$(CFLAGS)
+c_o_COMPILE = $$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $$(CFLAGS)
 
-cc_o_COMPILE = $$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $$(CFLAGS)
+cc_o_COMPILE = $$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(CXXFLAGS) $(OMK_CFLAGS) $$(CFLAGS)
 
 S_o_COMPILE = $$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(CPPFLAGS) $(AM_CFLAGS) $$(CFLAGS) $(ASFLAGS)
+       $(CPPFLAGS) $(OMK_CFLAGS) $$(CFLAGS) $(ASFLAGS)
 
 
 # Check GCC version for user build
@@ -140,9 +140,9 @@ endif
 $(2)/$(1)$(3:%=-%): $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-         then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS)   $$(CFLAGS) ; \
-         else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-         $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)$(3:%=-%)_LDFLAGS) -Wl,-Map,$(1)$(3:%=-%).map \
+         then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS)   $$(CFLAGS) ; \
+         else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+         $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)$(3:%=-%)_LDFLAGS) -Wl,-Map,$(1)$(3:%=-%).map \
          $$($(1)_OBJS) $$($(1)_MOREOBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
          -o $$@
        @echo "$(2)/$(1)$(3:%=-%): \\" >$(OBJS_DIR)/$(1)$(3:%=-%).exe.d

diff --git a/snippets/keil16x.omk b/snippets/keil16x.omk
index dd3d81a0f92fccc040a66965c143ae25e961b35f..9c224f1f3d01ce17b6e63038901bbaef03978137 100644 (file)
--- a/snippets/keil16x.omk
+++ b/snippets/keil16x.omk
@@ -39,9 +39,9 @@ endif
 #$$(warning DEFAULT_INCLUDES = $$(DEFAULT_INCLUDES))
 
 
-c_o_COMPILE = $$(CC) #$$(DEFS) $$(AM_CPPFLAGS)
+c_o_COMPILE = $$(CC) #$$(DEFS) $$(OMK_CPPFLAGS)
 
-cc_o_COMPILE = $$(CXX) #$$(DEFS) $$(AM_CPPFLAGS) 
+cc_o_COMPILE = $$(CXX) #$$(DEFS) $$(OMK_CPPFLAGS) 
 
 endef # COMPILER_DEFS_template
 
@@ -93,9 +93,9 @@ $(2)/$(1): $(USER_LIB_DIR)/timestamp
 
 
 #      $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-#        then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
-#        else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-#        $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
+#        then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS) $$(CFLAGS) ; \
+#        else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+#        $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
 #        -o $(2)/$(1)
 #      $(HC) $(2)/$(1) >$(2)/$(1).hex
 

diff --git a/snippets/keil51.omk b/snippets/keil51.omk
index e0bf46d45724507ad8425c87fea2c1407e188b81..03d3b157fef0ab21e4c7289ca222047996184330 100644 (file)
--- a/snippets/keil51.omk
+++ b/snippets/keil51.omk
@@ -14,10 +14,10 @@ AS = a51intel
 HC = oh51
 LI = l51
 
-c_o_COMPILE = $$(CC) $$(DEFS) $$(AM_CPPFLAGS)
+c_o_COMPILE = $$(CC) $$(DEFS) $$(OMK_CPPFLAGS)
 
-cc_o_COMPILE = $$(CXX) $$(DEFS) $$(DEFAULT_INCLUDES) $$(AM_CPPFLAGS) \
-       $$(CPPFLAGS) $$(AM_CXXFLAGS) $$(CFLAGS) $$(INCLUDES) -DOMK_FOR_USER
+cc_o_COMPILE = $$(CXX) $$(DEFS) $$(DEFAULT_INCLUDES) $$(OMK_CPPFLAGS) \
+       $$(CPPFLAGS) $$(OMK_CXXFLAGS) $$(CFLAGS) $$(INCLUDES) -DOMK_FOR_USER
 
 # lib_obj_SOURCES handling
 $$(LIB_DIR)/%.o: %.o
@@ -65,10 +65,10 @@ AS = a51intel
 HC = oh51
 LI = l51
 
-c_o_COMPILE = $(CC) $(DEFS) $(AM_CPPFLAGS)
+c_o_COMPILE = $(CC) $(DEFS) $(OMK_CPPFLAGS)
 
-cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 # lib_obj_SOURCES handling
 $(LIB_DIR)/%.o: %.o
@@ -130,9 +130,9 @@ $(2)/$(1): $(USER_LIB_DIR)/timestamp
 
 
 #      $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-#        then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
-#        else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-#        $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
+#        then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS) $$(CFLAGS) ; \
+#        else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+#        $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
 #        -o $(2)/$(1)
 #      $(HC) $(2)/$(1) >$(2)/$(1).hex
 

diff --git a/snippets/linux.omk b/snippets/linux.omk
index d65ccd0517f38fcb34a3527fdd94cf3985cf5742..f03c171c0fc4b7a23d5acd7cd43188d1eb494be3 100644 (file)
--- a/snippets/linux.omk
+++ b/snippets/linux.omk
@@ -18,9 +18,9 @@
 # lib_LOADLIBES    .. list of libraries linked to each executable
 # INCLUDES         .. additional include directories and defines for user-space
 #
-# AM_CFLAGS        .. C compiler flags
-# AM_CXXFLAGS      .. C++ compiler flags
-# AM_CPPFLAGS     .. C preprocessor flags
+# OMK_CFLAGS        .. C compiler flags
+# OMK_CXXFLAGS      .. C++ compiler flags
+# OMK_CPPFLAGS    .. C preprocessor flags
 # LDFLAGS         .. linker flags for programs linking
 
 BUILD_DIR_NAME = _build
@@ -103,14 +103,14 @@ endif
 
 ifdef USER_RULE_TEMPLATES
 
-c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_USER
+c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_USER
 
-cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -DOMK_FOR_USER
+cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(OMK_CXXFLAGS) $(CXXFLAGS) -DOMK_FOR_USER
 
-S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
+S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
 
 idl_COMPILE = $(IDL_COMPILER)
 
@@ -206,9 +206,9 @@ TARGET_OBJ_PREFIX = $(if $($(1)_CFLAGS)$($(1)_CXXFLAGS)$($(1)_CPPFLAGS),$(1)-,)
 TARGET_OBJS  = $(sort $(addprefix $(TARGET_OBJ_PREFIX),$(addsuffix .o,$(basename $(notdir $(TARGET_SOURCES))))))
 TARGET_LOBJS = $(sort $(addprefix $(TARGET_OBJ_PREFIX),$(addsuffix .lo,$(basename $(notdir $(TARGET_SOURCES))))))
 TARGET_IDLS = $($(1)_SERVER_IDL) $($(1)_CLIENT_IDL) $($(1)_IDL)
-TARGET_CFLAGS   = $(if $($(1)_CFLAGS),$($(1)_CFLAGS),$(AM_CFLAGS))
-TARGET_CXXFLAGS = $(if $($(1)_CXXFLAGS),$($(1)_CXXFLAGS),$(AM_CXXFLAGS))
-TARGET_CPPFLAGS = $(if $($(1)_CPPFLAGS),$($(1)_CPPFLAGS),$(AM_CPPFLAGS))
+TARGET_CFLAGS   = $(if $($(1)_CFLAGS),$($(1)_CFLAGS),$(OMK_CFLAGS))
+TARGET_CXXFLAGS = $(if $($(1)_CXXFLAGS),$($(1)_CXXFLAGS),$(OMK_CXXFLAGS))
+TARGET_CPPFLAGS = $(if $($(1)_CPPFLAGS),$($(1)_CPPFLAGS),$(OMK_CPPFLAGS))
 LINK_WITH_CXX = $(filter %.cc,$(TARGET_SOURCES))$(filter %.cxx,$(TARGET_SOURCES))$$(filter %.cpp,$(TARGET_SOURCES))
 
 # Syntax: $(call PROGRAM_template,<executable-name>,<dir>,<executable-suffix>,<linker-sript>)
@@ -217,13 +217,13 @@ $(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$
 
 $(call COMPILE_templates,$(TARGET_SOURCES_ABS),.o,$(TARGET_OBJ_PREFIX))
 
-$(2)/$(1)$(3): AM_CFLAGS=$(TARGET_CFLAGS)
-$(2)/$(1)$(3): AM_CXXFLAGS=$(TARGET_CXXFLAGS)
-$(2)/$(1)$(3): AM_CPPFLAGS=$(TARGET_CPPFLAGS)
+$(2)/$(1)$(3): OMK_CFLAGS=$(TARGET_CFLAGS)
+$(2)/$(1)$(3): OMK_CXXFLAGS=$(TARGET_CXXFLAGS)
+$(2)/$(1)$(3): OMK_CPPFLAGS=$(TARGET_CPPFLAGS)
 $(2)/$(1)$(3): $(TARGET_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $(if $(LINK_WITH_CXX),$$(CXX),$$(CC)) \
-         $$^ $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@
+         $$^ $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@
        @echo "$(2)/$(1)$(3): \\" >$(USER_OBJS_DIR)/$(1).exe.d
        @$(SED4OMK) -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134'  >>$(USER_OBJS_DIR)/$(1).exe.d
        @echo >>$(USER_OBJS_DIR)/$(1).exe.d
@@ -248,9 +248,9 @@ $(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$
 
 $(call COMPILE_templates,$(TARGET_SOURCES_ABS),.o,$(TARGET_OBJ_PREFIX))
 
-$(USER_LIB_DIR)/lib$(1).a: AM_CFLAGS=$(TARGET_CFLAGS)
-$(USER_LIB_DIR)/lib$(1).a: AM_CXXFLAGS=$(TARGET_CXXFLAGS)
-$(USER_LIB_DIR)/lib$(1).a: AM_CPPFLAGS=$(TARGET_CPPFLAGS)
+$(USER_LIB_DIR)/lib$(1).a: OMK_CFLAGS=$(TARGET_CFLAGS)
+$(USER_LIB_DIR)/lib$(1).a: OMK_CXXFLAGS=$(TARGET_CXXFLAGS)
+$(USER_LIB_DIR)/lib$(1).a: OMK_CPPFLAGS=$(TARGET_CPPFLAGS)
 $(USER_LIB_DIR)/lib$(1).a: $(TARGET_OBJS)
        @$(QUIET_CMD_ECHO) "  AR      $$@"
        $(Q) $(AR) rcs $$@ $$^
@@ -267,12 +267,12 @@ $(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$
 $(call COMPILE_templates,$(TARGET_SOURCES_ABS),.lo,$(TARGET_OBJ_PREFIX))
 
 .PHONY: $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar
-$(2)/$(1)$(3): AM_CFLAGS=$(TARGET_CFLAGS)
-$(2)/$(1)$(3): AM_CXXFLAGS=$(TARGET_CXXFLAGS)
-$(2)/$(1)$(3): AM_CPPFLAGS=$(TARGET_CPPFLAGS)
-$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: AM_CFLAGS = $(TARGET_CFLAGS) $(SOLIB_PICFLAGS)
-$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: AM_CXXFLAGS = $(TARGET_CXXFLAGS) $(SOLIB_PICFLAGS)
-$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: AM_CPPFLAGS = $(TARGET_CPPFLAGS)
+$(2)/$(1)$(3): OMK_CFLAGS=$(TARGET_CFLAGS)
+$(2)/$(1)$(3): OMK_CXXFLAGS=$(TARGET_CXXFLAGS)
+$(2)/$(1)$(3): OMK_CPPFLAGS=$(TARGET_CPPFLAGS)
+$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: OMK_CFLAGS = $(TARGET_CFLAGS) $(SOLIB_PICFLAGS)
+$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: OMK_CXXFLAGS = $(TARGET_CXXFLAGS) $(SOLIB_PICFLAGS)
+$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: OMK_CPPFLAGS = $(TARGET_CPPFLAGS)
 $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: $(TARGET_LOBJS)
        $(Q)echo '$(1)_objslo += $$$$(addprefix $(USER_OBJS_DIR)/,$$^)' > $$@.tmp; \
            echo '$(1)_libs += $$($(1)_LIBS) $$(lib_LOADLIBES)' >> $$@.tmp; \

diff --git a/snippets/rtems.omk b/snippets/rtems.omk
index 079435c8bb6a4af2da40a14f73c9b765d1eb12d4..3bf66c3f3f1771f6bd7609dd80c5edec8ac09dbb 100644 (file)
--- a/snippets/rtems.omk
+++ b/snippets/rtems.omk
@@ -39,10 +39,10 @@ CPPFLAGS  += -I $(USER_INCLUDE_DIR)
 
 CPPFLAGS  += $(CONFIG_OMK_DEFINES)
 
-#CPPFLAGS  += $(AM_CPPFLAGS)
-#CFLAGS    += $(AM_CFLAGS)
-#CXXFLAGS  += $(AM_CXXFLAGS)
-#LDFLAGS   += $(CFLAGS) $(AM_CFLAGS) $(LD_PATHS:%=-L%)
+#CPPFLAGS  += $(OMK_CPPFLAGS)
+#CFLAGS    += $(OMK_CFLAGS)
+#CXXFLAGS  += $(OMK_CXXFLAGS)
+#LDFLAGS   += $(CFLAGS) $(OMK_CFLAGS) $(LD_PATHS:%=-L%)
 
 LOADLIBES += -L$(USER_LIB_DIR)
 
@@ -108,14 +108,14 @@ ifdef USER_RULE_TEMPLATES
 #%.lo: %.c
 #      $(CC) -o $@ $(LCFLAGS) -c $<
 
-c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
-cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) -DOMK_FOR_USER
+cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CXXFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
-S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
+S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
 
 # Check GCC version for user build
 ifndef CC_MAJOR_VERSION
@@ -194,9 +194,9 @@ $(2)/$(1): $(USER_LIB_DIR)/timestamp
 $(2)/$(1): $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-         then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
-         else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-         $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
+         then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS) $$(CFLAGS) ; \
+         else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+         $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
          -o $(2)/$(1)
 #@echo "$(2)/$(1): \\" >$(USER_OBJS_DIR)/$(1).exe.d
 #@$(SED4OMK) -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(USER_OBJS_DIR)/$(1).exe.map  >>$(USER_OBJS_DIR)/$(1).exe.d

diff --git a/snippets/sdcc.omk b/snippets/sdcc.omk
index 0999a616fd5e90b3ab8188719ef7b03f915c7d9b..d060c50db26802f036870465236fbdc17c98eef1 100644 (file)
--- a/snippets/sdcc.omk
+++ b/snippets/sdcc.omk
@@ -83,14 +83,14 @@ USER_SOURCES2OBJS = $(OBJ_EXT)/.c $(OBJ_EXT)/.cc $(OBJ_EXT)/.cxx $(OBJ_EXT)/.S $
 #%.o: %.c
 #      $(CC) -o $@ $(LCFLAGS) -c $<
 
-c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
-cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 S_o_COMPILE = $$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(CPPFLAGS) $(AM_CFLAGS) $$(CFLAGS) $(ASFLAGS)
+       $(CPPFLAGS) $(OMK_CFLAGS) $$(CFLAGS) $(ASFLAGS)
 
 # Check C compiler version for user build
 ifndef CC_MAJOR_VERSION
@@ -157,9 +157,9 @@ $(2)/$(1)$(addprefix -,$(4))$(3): $(USER_LIB_DIR)/timestamp
 $(2)/$(1)$(addprefix -,$(4))$(3): $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-         then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
-         else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-         $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
+         then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS) $$(CFLAGS) ; \
+         else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+         $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
          -o $(2)/$(1)$(addprefix -,$(4))$(3)
        $(HEX2BIN) $(2)/$(1)$(addprefix -,$(4))$(3)
 endef

diff --git a/snippets/vxworks.omk b/snippets/vxworks.omk
index 7c10f46a5e67e7baeb79b6be8b5e1587f5d7fbcc..69feaec61daa1fb40c6585ca69f659ad50f2602a 100644 (file)
--- a/snippets/vxworks.omk
+++ b/snippets/vxworks.omk
@@ -62,11 +62,11 @@ endif
 # Export some variables to VxWorks makefiles
 CPPFLAGS  += -I $(USER_INCLUDE_DIR)
 
-ADDED_CFLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
+ADDED_CFLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
 
-ADDED_C++FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
+ADDED_C++FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
 
 export ADDED_CFLAGS ADDED_C++FLAGS
 

diff --git a/tests/programs-cflags b/tests/programs-cflags
index 0d236e716ba231aa4810f717f98f19f7f0c905a2..0b9d891e5fa79edf492275196718e8a6f3ea0312 100755 (executable)
--- a/tests/programs-cflags
+++ b/tests/programs-cflags
@@ -34,21 +34,21 @@ grepout() {
 
 set -o pipefail
 
-WVSTART "AM_CFLAGS"
+WVSTART "OMK_CFLAGS"
 create_files
 needs_valid_CC
-WVPASS make AM_CFLAGS=-DNUMBER=123
+WVPASS make OMK_CFLAGS=-DNUMBER=123
 WVPASS grepout 123
 
-WVSTART "CFLAGS override AM_CFLAGS"
+WVSTART "CFLAGS override OMK_CFLAGS"
 create_files
-WVPASS make AM_CFLAGS=-DNUMBER=123 CFLAGS=-DNUMBER=321
+WVPASS make OMK_CFLAGS=-DNUMBER=123 CFLAGS=-DNUMBER=321
 WVPASS grepout 321
 
 
-WVSTART "AM_CFLAGS in config.omk"
+WVSTART "OMK_CFLAGS in config.omk"
 create_files
-echo "AM_CFLAGS=-DNUMBER=123" > config.omk
+echo "OMK_CFLAGS=-DNUMBER=123" > config.omk
 WVPASS make
 WVPASS grepout 123
 
@@ -62,13 +62,13 @@ EOF
 WVPASS make V=1
 WVPASS grepout 123
 
-WVSTART "Target specific CFLAGS override AM_CFLAGS"
+WVSTART "Target specific CFLAGS override OMK_CFLAGS"
 create_files
 cat > 'Makefile.omk' <<'EOF'
 bin_PROGRAMS = test
 test_SOURCES = test.c
 test_CFLAGS = -DNUMBER=123
-AM_CFLAGS   = -DNUMBER=456
+OMK_CFLAGS   = -DNUMBER=456
 EOF
 WVPASS make V=1
 WVPASS grepout 123