From b4f37d7ecad3ac703f611ccaeefd24926d9d8e73 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 1 Jun 1998 19:23:27 +0000 Subject: [PATCH] Removed DIRECTORY_TARGETS. --- config/RULES.Host | 67 ++++++++++++++++++----------------------------- config/RULES.Unix | 30 ++++++++++----------- config/RULES.Vx | 47 +++++++++++++-------------------- 3 files changed, 58 insertions(+), 86 deletions(-) diff --git a/config/RULES.Host b/config/RULES.Host index 2231c4dc9..034c68cb0 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -249,7 +249,7 @@ INSTALL_OSINC= $(OSINC:%= $(INSTALL_OSINCLUDE)/%) INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%) MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ - $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) + $(MANLIST), $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%) INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%) INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%) @@ -270,17 +270,6 @@ INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%) MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n)) -DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_INCLUDE)/os \ - $(INSTALL_OSINCLUDE) $(INSTALL_DOC) $(INSTALL_DBD) \ - $(INSTALL_LOCATION_BIN) $(INSTALL_BIN) $(INSTALL_LIB) \ - $(INSTALL_LOCATION_LIB) $(INSTALL_CONFIG) \ - $(MAN_DIRECTORY_TARGETS) $(INSTALL_MAN) \ - $(INSTALL_TEMPLATES) - -ifdef TEMPLATES_DIR -DIRECTORY_TARGETS += $(INSTALL_TEMPLATES)/$(TEMPLATES_DIR) -endif - #--------------------------------------------------------------- ifneq (x$(SHARED_LIBRARIES_$(ARCH_CLASS)),x) SHARED_LIBRARIES+=$(subst -nil-,,$(SHARED_LIBRARIES_$(ARCH_CLASS))) @@ -313,7 +302,6 @@ endif # EPICS_BASE # on some archs), don't define (and build) any library! ifdef LIBRARY ifdef LIBOBJS -LIBTARGETS = $(INSTALL_LOCATION_LIB) $(INSTALL_LIB) LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) # check if shared libraries requested @@ -342,21 +330,20 @@ all:: install build:: $(LIBTARGETS) $(PROD) $(TESTPROD) \ $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME) -inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) \ - $(INSTALL_INCLUDE)/os $(INSTALL_OSINCLUDE) $(INSTALL_OSINC) +inc:: $(INSTALL_INC) $(INSTALL_OSINC) rebuild:: clean install install:: inc buildInstall -buildInstall :: build $(TARGETS) $(INSTALL_LOCATION_BIN) \ - $(INSTALL_BIN) $(INSTALL_SCRIPTS) $(INSTALL_PROD) \ - $(INSTALL_MAN) $(INSTALL_MANS) \ - $(INSTALL_DOC) $(INSTALL_DOCS) \ +buildInstall :: build $(TARGETS) \ + $(INSTALL_SCRIPTS) $(INSTALL_PROD) \ + $(INSTALL_MANS) \ + $(INSTALL_DOCS) \ $(INSTALL_HTMLS) \ - $(INSTALL_TEMPLATES) $(INSTALL_TEMPLATES_SUBDIR) $(INSTALL_TEMPLATE) \ - $(INSTALL_CONFIG) $(INSTALL_CONFIGS) \ - $(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) \ + $(INSTALL_TEMPLATE) \ + $(INSTALL_CONFIGS) \ + $(INSTALL_DBS) $(INSTALL_BPTS) \ $(INSTALL_DBDNAME) $(INSTALL_INCREC) \ $(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) @@ -369,10 +356,6 @@ clean:: @echo "Cleaning" @$(RM) *.i *$(OBJ) *.a $(PROD) $(TESTPROD) $(LIBNAME) $(SHRLIBNAME) $(INC) *$(RES) $(TARGETS) -$(DIRECTORY_TARGETS) : - $(MKDIR) $@ - - #--------------------------------------------------------------- # Products # @@ -632,11 +615,11 @@ endif $(INSTALL_DBD)/%: % @echo "Installing $@" - @$(INSTALL) -m 644 $< $(INSTALL_DBD) + @$(INSTALL) -d -m 644 $< $(INSTALL_DBD) $(INSTALL_DBD)/%: ../% @echo "Installing $@" - @$(INSTALL) -m 644 $< $(INSTALL_DBD) + @$(INSTALL) -d -m 644 $< $(INSTALL_DBD) %Record.h: %Record.dbd $(RM) $@ @@ -682,19 +665,19 @@ endif # RANLIB $(INSTALL_BIN)/%: ../os/$(ARCH_CLASS)/% @echo "Installing os-specific script $@" - @$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN) + @$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN) $(INSTALL_BIN)/%: % @echo "Installing binary $@" - @$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN) + @$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN) $(INSTALL_BIN)/%: ../% @echo "Installing script $@" - @$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN) + @$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN) $(INSTALL_LIB)/%.a: %.a @echo "Installing library $@" - @$(INSTALL) -m 644 $< $(INSTALL_LIB) + @$(INSTALL) -d -m 644 $< $(INSTALL_LIB) ifdef RANLIB $(RANLIB) $(RANLIBFLAGS) $@ endif # RANLIB @@ -713,43 +696,43 @@ endif # SHRLIB_VERSION $(INSTALL_TCLLIB)/%: % @echo "Installing Tcl library $@" - @$(INSTALL) -m 555 $< $(INSTALL_TCLLIB) + @$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB) $(INSTALL_TCLLIB)/%: ../% @echo "Installing Tcl library $@" - @$(INSTALL) -m 555 $< $(INSTALL_TCLLIB) + @$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB) $(INSTALL_CONFIG)/%: % @echo "Installing config file $@" - @$(INSTALL) -m 644 $< $(INSTALL_CONFIG) + @$(INSTALL) -d -m 644 $< $(INSTALL_CONFIG) $(INSTALL_CONFIG)/%: ../% @echo "Installing config file $@" - @$(INSTALL) -m 644 $< $(INSTALL_CONFIG) + @$(INSTALL) -d -m 644 $< $(INSTALL_CONFIG) $(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : % @echo "Installing man file $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../% @echo "Installing man file $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_INCLUDE)/%: % @echo "Installing include file $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_INCLUDE)/%: ../% @echo "Installing include file $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_DOC)/%: % @echo "Installing doc $@" - @$(INSTALL) -m 644 $< $(INSTALL_DOC) + @$(INSTALL) -d -m 644 $< $(INSTALL_DOC) $(INSTALL_DOC)/%: ../% @echo "Installing doc $@" - @$(INSTALL) -m 644 $< $(INSTALL_DOC) + @$(INSTALL) -d -m 644 $< $(INSTALL_DOC) $(INSTALL_HTML)/$(HTMLS_DIR)/%: % @echo "Installing html $@" diff --git a/config/RULES.Unix b/config/RULES.Unix index 33d8f44e2..3e171b6f3 100644 --- a/config/RULES.Unix +++ b/config/RULES.Unix @@ -171,11 +171,11 @@ $(TARGETS) $(PROD): $(DEPLIBS) $(INSTALL_DBD)/%: % @echo "Installing $@" - @$(INSTALL) -m 644 $< $(INSTALL_DBD) + @$(INSTALL) -d -m 644 $< $(INSTALL_DBD) $(INSTALL_DBD)/%: ../% @echo "Installing $@" - @$(INSTALL) -m 644 $< $(INSTALL_DBD) + @$(INSTALL) -d -m 644 $< $(INSTALL_DBD) %Record.h: %Record.dbd $(RM) $@ @@ -219,26 +219,26 @@ $(LIBNAME): $(LIBOBJS) $(INSTALL_BIN)/%: % @echo "Installing Binary $@" - @$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN) + @$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN) $(INSTALL_BIN)/%: ../% @echo "Installing Binary $@" - @$(INSTALL_PRODUCT) -m 555 $< $(INSTALL_BIN) + @$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN) $(INSTALL_LIB)/%.a: %.a @echo "Installing library $@" - @$(INSTALL) -m 644 $< $(INSTALL_LIB) + @$(INSTALL) -d -m 644 $< $(INSTALL_LIB) @if [ ! -z "$(RANLIB)" ] ; then\ $(RANLIB) $(RANLIBFLAGS) $@; \ fi $(INSTALL_TCLLIB)/%: % @echo "Installing Tcl library $@" - @$(INSTALL) -m 555 $< $(INSTALL_TCLLIB) + @$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB) $(INSTALL_TCLLIB)/%: ../% @echo "Installing Tcl library $@" - @$(INSTALL) -m 555 $< $(INSTALL_TCLLIB) + @$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB) $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS) @echo "Updating $@" @@ -246,35 +246,35 @@ $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS) $(INSTALL_CONFIG)/%: % @echo "Installing Config File $@" - @$(INSTALL) -m 644 $< $(INSTALL_CONFIG) + @$(INSTALL) -d -m 644 $< $(INSTALL_CONFIG) $(INSTALL_CONFIG)/%: ../% @echo "Installing Config File $@" - @$(INSTALL) -m 644 $< $(INSTALL_CONFIG) + @$(INSTALL) -d -m 644 $< $(INSTALL_CONFIG) $(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : % @echo "Installing man file $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(addsuffix /%,$(MAN_DIRECTORY_TARGETS)) : ../% @echo "Installing man file $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_INCLUDE)/%: % @echo "Installing Include File $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_INCLUDE)/%: ../% @echo "Installing Include File $@" - @$(INSTALL) -m 644 $< $(@D) + @$(INSTALL) -d -m 644 $< $(@D) $(INSTALL_DOC)/%: % @echo "Installing doc $@" - @$(INSTALL) -m 644 $< $(INSTALL_DOC) + @$(INSTALL) -d -m 644 $< $(INSTALL_DOC) $(INSTALL_DOC)/%: ../% @echo "Installing doc $@" - @$(INSTALL) -m 644 $< $(INSTALL_DOC) + @$(INSTALL) -d -m 644 $< $(INSTALL_DOC) $(INSTALL_HTML)/$(HTMLS_DIR)/%: % @echo "Installing html $@" diff --git a/config/RULES.Vx b/config/RULES.Vx index 5e67e69ad..b7f6e8f37 100644 --- a/config/RULES.Vx +++ b/config/RULES.Vx @@ -18,7 +18,7 @@ INSTALL_OSINC = $(OSINC:%= $(INSTALL_OSINCLUDE)/%) INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%) MANLIST = 1 2 3 4 5 6 7 8 9 INSTALL_MANS = $(foreach n, \ - $(MANLIST),$(INSTALL_MAN)/man$(n) $(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) + $(MANLIST),$(MAN$(n):%= $(INSTALL_MAN)/man$(n)/%)) INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%) INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%) INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%) @@ -33,11 +33,6 @@ INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%) MAN_DIRECTORY_TARGETS = $(foreach n, $(MANLIST),$(INSTALL_MAN)/man$(n)) -DIRECTORY_TARGETS = $(INSTALL_INCLUDE) $(INSTALL_DOC) $(INSTALL_DBD) \ - $(INSTALL_OSINCLUDE) $(INSTALL_INCLUDE)/os \ - $(INSTALL_LOCATION_BIN) $(INSTALL_BIN) \ - $(MAN_DIRECTORY_TARGETS) $(INSTALL_MAN) - # if we are not building base add base includes # ifneq ($(EPICS_BASE),$(TOP)) @@ -55,20 +50,17 @@ pre_build:: build:: pre_build $(MENUS) $(RECTYPES) $(BPTS)\ $(LIBNAME) $(LIBNAME_CXX) $(TARGETS) $(PROD) $(DBDNAME) -inc:: $(INSTALL_INCLUDE) $(INSTALL_INC) $(INSTALL_INCLUDE)/os \ - $(INSTALL_OSINCLUDE) $(INSTALL_OSINC) - +inc:: $(INSTALL_INC) $(INSTALL_OSINC) + install:: inc buildInstall buildInstall :: build $(INSTALL_INCREC)\ - $(INSTALL_LOCATION_BIN) \ - $(INSTALL_BIN) $(INSTALL_LIBS) $(INSTALL_LIBS_CXX) \ + $(INSTALL_LIBS) $(INSTALL_LIBS_CXX) \ $(TARGETS) $(INSTALL_PROD) \ - $(INSTALL_MAN) $(INSTALL_MANS)\ - $(INSTALL_DOC) $(INSTALL_DOCS) \ + $(INSTALL_MANS) $(INSTALL_DOCS) \ $(INSTALL_HTMLS) \ $(INSTALL_SCRIPTS) $(INSTALL_INSTALLS)\ - $(INSTALL_DBD) $(INSTALL_DBS) $(INSTALL_BPTS) \ + $(INSTALL_DBS) $(INSTALL_BPTS) \ $(INSTALL_DBDNAME) ifdef BIN_INSTALLS @@ -85,9 +77,6 @@ clean:: @$(RM) *.i *.o *.a *.out $(TARGETS) $(PROD) $(LIBNAME) $(INC) \ $(DBDINSTALL) $(MENUS) $(RECTYPES) $(BPTS) $(DBDNAME) -$(DIRECTORY_TARGETS) : - @$(MKDIR) $@ - # The order of the following dependencies is # VERY IMPORTANT !!!! @@ -185,16 +174,16 @@ endif $(MV) $(