From 9ec0cff0e5225b05fc24909c06e648b8297b0e57 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 2 Apr 2012 15:34:23 -0500 Subject: [PATCH] configure: Clean up some other DBDEPENDS stuff --- configure/RULES.Db | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/configure/RULES.Db b/configure/RULES.Db index 8bc67b136..9f68f0bb7 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -113,9 +113,6 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \ $(patsubst $(COMMON_DIR)/%,%,$(COMMON_DBS)) \ $(patsubst $(COMMON_DIR)/%,%,$(COMMON_DBDS))) -DBDDEPENDS_FLAGS = $(subst -I,,$(filter-out -S%,$(DBDFLAGS))) -DBDDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(DBDDEPENDS_FLAGS) $@ $< - MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl ##################################################### @@ -307,8 +304,8 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf $(COMMON_DIR)/%.db$(RAW): %.substitutions @$(RM) $(notdir $@)$(DEP) - $(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $(notdir $@)$(DEP) - $(ECHO) "$@:$(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP) + $(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) > $(notdir $@)$(DEP) + @echo "$@: $(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP) $(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)" @$(RM) $@ $*.tmp $(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > $*.tmp @@ -316,7 +313,7 @@ $(COMMON_DIR)/%.db$(RAW): %.substitutions $(COMMON_DIR)/%.db$(RAW): %.template @$(RM) $(notdir $@)$(DEP) - @$(MAKEDBDEPENDS) $@ $^ >> $(notdir $@)$(DEP) + @$(MAKEDBDEPENDS) $@ $< > $(notdir $@)$(DEP) $(ECHO) "Inflating database from $<" @$(RM) $@ $*.tmp $(MSI) $(DBFLAGS) $< > $*.tmp