From: Pavel Pisa Date: Wed, 19 Sep 2007 21:30:00 +0000 (+0000) Subject: Corrected omitted occurrences of direct dependency on LOCAL_CONFIG_H. X-Git-Tag: v0.1~98 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/557039aec0201f137ccf35228709e124db402f4d?hp=8a38ab00c99a9111769295204f420b46917d1067 Corrected omitted occurrences of direct dependency on LOCAL_CONFIG_H. Responsibility for configuretion headers generation is solely left on include-pass. darcs-hash:20070919213018-ff715-d01580f551669d8fd80f309ae7932bfa0b61830f.gz --- diff --git a/snippets/gcc b/snippets/gcc index e0f7a39..79e408d 100644 --- a/snippets/gcc +++ b/snippets/gcc @@ -100,7 +100,7 @@ endef # Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ @@ -110,7 +110,7 @@ endef # Syntax: $(call COMPILE_S_o_template,,,) define COMPILE_S_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " AS $$@" $(Q) if $$(S_o_COMPILE) -D__ASSEMBLY__ $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then if [ -e "$$@.d.tmp" ] ; then mv -f "$$@.d.tmp" "$$@.d" ; fi ; \ diff --git a/snippets/keil16x b/snippets/keil16x index f586fe0..ea1943c 100644 --- a/snippets/keil16x +++ b/snippets/keil16x @@ -49,7 +49,7 @@ endef # COMPILER_DEFS_template # Syntax: $(call COMPILE_c_o_template,,,) define COMPILE_c_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CC $$@" # Export include paths in an environment variable $(Q)export C166INC=`echo '$$(shell cygpath -w $$(subst -I,,$$(DEFAULT_INCLUDES)))'|sed -e "s/ \+/;/g"`; \ @@ -63,14 +63,14 @@ endef # Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) echo "C++ compilation not suported for this compiler" endef # Syntax: $(call COMPILE_S_o_template,,,) define COMPILE_S_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " ASM $$@" $(Q)$$(AS) '$$(shell cygpath -w $(1))' 'OBJECT($$@)' 'PRINT($$(@:%$$(OBJ_EXT)=%.lst))' '$$(ASDIRECTIVES)' $(FILTER_KEIL_ASM_OUTPUT); \ EL=$$$$?; if [ $$$$EL -le 1 ] ; then touch "$$@.d" ; \ diff --git a/snippets/keil51 b/snippets/keil51 index ea8ebea..222e859 100644 --- a/snippets/keil51 +++ b/snippets/keil51 @@ -27,7 +27,7 @@ endef # COMPILER_DEFS_template # Syntax: $(call COMPILE_c_o_template,,,) define COMPILE_c_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CC $$@" $(Q) cp $$< .;\ export C51INC=`echo "$$(DEFAULT_INCLUDES)" | sed -e 's/-I//' -e 's/-I/;/g' -e 's/ //g'`;\ @@ -45,14 +45,14 @@ endef # Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) echo "C++ compilation not suported for this compiler" endef # Syntax: $(call COMPILE_S_o_template,,,) define COMPILE_S_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " ASM $$@" $(Q) \ cp $$< .; \ @@ -78,7 +78,7 @@ endef # COMPILER_DEFS_template # Syntax: $(call COMPILE_c_o_template,,,) define COMPILE_c_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CC $$@" $(Q) cp $$< .;\ export C51INC=`echo "$$(DEFAULT_INCLUDES)" | sed -e 's/-I//' -e 's/-I/;/g' -e 's/ //g'`;\ @@ -96,14 +96,14 @@ endef # Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) echo "C++ compilation not suported for this compiler" endef # Syntax: $(call COMPILE_S_o_template,,,) define COMPILE_S_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " ASM $$@" $(Q) \ cp $$< .; \ diff --git a/snippets/linux b/snippets/linux index 0d3c284..5904859 100644 --- a/snippets/linux +++ b/snippets/linux @@ -397,7 +397,7 @@ endef define COMPILE_cc_o_kern_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) @$(QUIET_CMD_ECHO) " CXX [K] $$@" $(Q) if $$(cc_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) $(KERN_KBUILD_MODNAME) \ -D"KBUILD_BASENAME=$(KERN_MQ)$(notdir $(basename $(1)))$(KERN_MQ)" \ diff --git a/snippets/rtems b/snippets/rtems index 006a3f2..c79e565 100644 --- a/snippets/rtems +++ b/snippets/rtems @@ -112,7 +112,7 @@ endif # Syntax: $(call COMPILE_c_o_template,,,) define COMPILE_c_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CC $$@" $(Q) if $$(c_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ @@ -123,7 +123,7 @@ endef # Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ @@ -134,7 +134,7 @@ endef # Syntax: $(call COMPILE_S_o_template,,,) define COMPILE_S_o_template -$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) +$(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " AS $$@" $(Q) if $$(S_o_COMPILE) -D__ASSEMBLY__ $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then if [ -e "$$@.d.tmp" ] ; then mv -f "$$@.d.tmp" "$$@.d" ; fi ; \