From 14e196ad40b3eaff212015a459d30456fee2216f Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 15 Sep 1997 19:27:12 +0000 Subject: [PATCH] Backed out accidental commit. --- config/CONFIG | 8 -------- config/RULES.Host | 23 ++++------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/config/CONFIG b/config/CONFIG index 37e312ba3..807517a2c 100644 --- a/config/CONFIG +++ b/config/CONFIG @@ -44,11 +44,3 @@ include $(EPICS_BASE)/config/CONFIG.$(T_A) #VX_WARN=YES #etc. # - -#UNIX_OPT_FLAGS = -g -#CMPLR=STRICT -#CPLUSPLUS=G++ -#INSTALL_LOCATION = /home/phoebus/JBA/epics/testinstall - -# OPTIM_YES = -g - diff --git a/config/RULES.Host b/config/RULES.Host index 2f702c457..05e631b3f 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -280,12 +280,6 @@ clean:: @echo "Cleaning" @$(RM) *.i *$(OBJ) *.a $(PROD) $(TESTPROD) $(LIBNAME) $(INC) - -# PROD dependanies -# Do not put dependancy files on an implicit rule line -$(PROD): $(PRODDEPLIBS) - - $(DIRECTORY_TARGETS) : $(MKDIR) $@ @@ -313,7 +307,7 @@ endif PROD_OBJS=$(addsuffix $(OBJ), $(basename $(SRCS))) -$(PROD): $(PROD_OBJS) +$(PROD): $(PROD_OBJS) $(PRODDEPLIBS) @$(RM) $@ $(PROD_LINKER) $(PROD_OBJS) $(LDLIBS) endif @@ -345,17 +339,12 @@ endif # Hint: The $(subst...) construct removes the .c or .cc # as well as the '../' from the filename and adds $(OBJ): # e.g. $< = '../abc.c' -> 'abc.o' -%$(EXE): %.c +%$(EXE): %.c $(PRODDEPLIBS) @$(RM) $@ $(COMPILE.c) $< $(LINK.c) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS) -%$(EXE): %.cc - @$(RM) $@ - $(COMPILE.cc) $< - $(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS) - -%$(EXE): %.C +%$(EXE): %.cc $(PRODDEPLIBS) @$(RM) $@ $(COMPILE.cc) $< $(LINK.cc) $(subst ../,,$(basename $<))$(OBJ) $(LDLIBS) @@ -368,10 +357,6 @@ endif @$(RM) $@ $(COMPILE.cc) $< -%$(OBJ): %.C - @$(RM) $@ - $(COMPILE.cc) $< - # # rename the y.tab.h file only if we # are creating it @@ -415,7 +400,7 @@ endif %.db: ../%.edf $(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) $< -%.edf: ../%.sch +%.edf: ../%.sch $(DEPSCHS) @if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi $(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) $<