Remove some unnecessary touch's
authorIan Lynagh <igloo@earth.li>
Sat, 3 Dec 2011 00:34:30 +0000 (00:34 +0000)
committerIan Lynagh <igloo@earth.li>
Sat, 3 Dec 2011 00:34:30 +0000 (00:34 +0000)
They made a dependency cycle in the rules used to build the touch
program on Windows.

rules/build-dependencies.mk
rules/build-prog.mk

index 6ab2edc..a37ff16 100644 (file)
@@ -31,9 +31,8 @@ ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES"
 # indirectly) include the generated includes files.
 $$($1_$2_depfile_haskell) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM)
 
-$$($1_$2_depfile_haskell) : $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) $$(TOUCH_DEP) | $$$$(dir $$$$@)/.
+$$($1_$2_depfile_haskell) : $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS) $$($1_$2_HC_MK_DEPEND_DEP) | $$$$(dir $$$$@)/.
        $$(call removeFiles,$$@.tmp)
-       "$$(TOUCH_CMD)" $$@.tmp
 ifneq "$$($1_$2_HS_SRCS)" ""
        "$$($1_$2_HC_MK_DEPEND)" -M $$($1_$2_MKDEPENDHS_FLAGS) \
            $$(filter-out -split-objs, $$($1_$2_v_ALL_HC_OPTS)) \
@@ -54,9 +53,8 @@ endif
 # includes files.
 $$($1_$2_depfile_c_asm) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM)
 
-$$($1_$2_depfile_c_asm) : $$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES) $$(TOUCH_DEP) | $$$$(dir $$$$@)/.
+$$($1_$2_depfile_c_asm) : $$($1_$2_C_FILES_DEPS) $$($1_$2_S_FILES) | $$$$(dir $$$$@)/.
        $$(call removeFiles,$$@.tmp)
-       "$$(TOUCH_CMD)" $$@.tmp
 ifneq "$$(strip $$($1_$2_C_FILES_DEPS)$$($1_$2_S_FILES))" ""
 # We ought to actually do this for each way in $$($1_$2_WAYS), but then
 # it takes a long time to make the C deps for the RTS (30 seconds rather
index aa66516..69c5bd5 100644 (file)
@@ -94,9 +94,8 @@ $(call all-target,$1_$2,$1/$2/build/tmp/$$($1_$2_PROG))
 # INPLACE_BIN might be empty if we're distcleaning
 ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
-$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) $$(TOUCH_DEP) | $$$$(dir $$$$@)/.
+$$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
        "$$(CP)" -p $$< $$@
-       "$$(TOUCH_CMD)" $$@
 endif
 endif