diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 6f9a0733b..b79e15cf5 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -378,14 +378,14 @@ PATH_FILTER = $(1)$(warning PATH_FILTER is deprecated; used for $(1)) # each list starts with the destination directory name(s) # to make sure it's there -INSTALL_PROD= $(PRODNAME:%= $(INSTALL_BIN)/%) -INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%) -INSTALL_MUNCHS= $(MUNCHNAME:%=$(INSTALL_BIN)/%) -INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%) -INSTALL_LOADABLE_SHRLIBS= $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%) -INSTALL_DLLSTUB_LIBS=$(DLLSTUB_LIBNAME:%=$(INSTALL_LIB)/%) -INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%) -INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%) +INSTALL_PROD = $(PRODNAME:%= $(INSTALL_BIN)/%) +INSTALL_LIBS = $(LIBNAME:%=$(INSTALL_LIB)/%) +INSTALL_MUNCHS = $(MUNCHNAME:%=$(INSTALL_BIN)/%) +INSTALL_SHRLIBS = $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%) +INSTALL_LOADABLE_SHRLIBS = $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%) +INSTALL_DLLSTUB_LIBS = $(DLLSTUB_LIBNAME:%=$(INSTALL_LIB)/%) +INSTALL_TCLLIBS = $(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%) +INSTALL_TCLINDEX = $(TCLINDEX:%=$(INSTALL_TCLLIB)/%) INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%) INSTALL_OBJS = $(OBJSNAME:%= $(INSTALL_BIN)/%) diff --git a/configure/RULES.Db b/configure/RULES.Db index dd6eba2c6..fae5014ab 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -167,7 +167,7 @@ all: install install: buildInstall -buildInstall : build +buildInstall: build rebuild: clean install @@ -196,21 +196,21 @@ endif #--------------------------------------------------------------- # build dependancies, clean rule -inc : $(COMMON_INC) $(INSTALL_INC) +inc: $(COMMON_INC) $(INSTALL_INC) -build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \ +build: $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \ $(INSTALL_DBDS) $(INSTALL_DBS) \ $(DBDDEPENDS_FILES) $(TARGETS) \ $(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS) clean: db_clean -db_clean : +db_clean: @$(RM) $(COMMONS) $(DBDDEPENDS_FILES) @$(RM) *_registerRecordDeviceDriver.cpp @$(RM) $(TARGETS) -.PHONY : db_clean +.PHONY: db_clean realclean: clean @@ -389,7 +389,7 @@ $(COMMON_DIR)/%.dbd: ../%Include.dbd # Make DBDCAT file x depend on x_DBD source files define DBDCAT_template -$$(COMMON_DIR)/$(1).dbd : ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) ) +$$(COMMON_DIR)/$(1).dbd: ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) ) endef $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name)))) @@ -418,7 +418,7 @@ $(INSTALL_DBD)/%: ../% @$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D) define DBD_INSTALLS_template -$$(INSTALL_DBD)/$$(notdir $(1)) : $(1) +$$(INSTALL_DBD)/$$(notdir $(1)): $(1) $(ECHO) "Installing $$@" @$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD) endef @@ -460,7 +460,7 @@ $(COMMON_DIR)/%.html: ../%.pl #--------------------------------------------------------------- # DB files -$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf +$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf $(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $< @$(REPLACEVAR) < $*.VAR > $@ @$(RM) $*.VAR @@ -514,7 +514,7 @@ $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db @$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D) define DB_INSTALLS_template -$$(INSTALL_DB)/$$(notdir $(1)) : $(1) +$$(INSTALL_DB)/$$(notdir $(1)): $(1) $(ECHO) "Installing $$@" @$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB) endef @@ -539,4 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file)))) $(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP) .PRECIOUS: %_registerRecordDeviceDriver.cpp - diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 3b8f7b2cb..743ba503e 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -147,14 +147,13 @@ build: inc build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \ $(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS) -inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) +inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) -buildInstall : \ +buildInstall: \ $(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \ $(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \ + $(INSTALL_HTMLS) $(INSTALL_DOCS) \ $(INSTALL_OBJS) \ - $(INSTALL_DOCS) \ - $(INSTALL_HTMLS) \ $(INSTALL_TEMPLATE) \ $(INSTALL_BIN_INSTALLS) @@ -214,7 +213,7 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB) $(LINK.cpp) $(MT_EXE_COMMAND) -%_ctdt$(OBJ) : %_ctdt.c +%_ctdt$(OBJ): %_ctdt.c @$(RM) $@ $(COMPILE.ctdt) $< @@ -232,9 +231,9 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB) # Cancel GNUMake's built-in rules, which don't have our _INC # dependencies so could get used in some circumstances (gdd) -%.o : %.c -%.o : %.cc -%.o : %.cpp +%.o: %.c +%.o: %.cc +%.o: %.cpp # Include files are order-only prerequisites for compilation: %$(OBJ): %.c | $(COMMON_INC) $(INSTALL_INC) @@ -268,7 +267,7 @@ YACCOPT ?= $($*_YACCOPT) # must be a separate rule since when not using '-d' the # prefix for .h will be different then .c -%.h : %.c %.y +%.h: %.c %.y %.c: %.l @$(RM) $@ @@ -421,14 +420,14 @@ endif # Install rules for BIN_INSTALLS and LIB_INSTALLS define BIN_INSTALLS_template -$$(INSTALL_BIN)/$$(notdir $(1)) : $(1) +$$(INSTALL_BIN)/$$(notdir $(1)): $(1) $(ECHO) "Installing $$(