From cc01f3f5fc25238532d5c0b83c14b5b4aaf23fee Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 9 Sep 1994 17:33:30 +0000 Subject: [PATCH] Cleanup of files --- Makefile | 75 ++----------------------------------- Makefile.subdirs | 59 ++--------------------------- src/as/Makefile.Unix | 8 +--- src/as/Makefile.Vx | 3 +- src/ca/Makefile.Unix | 7 +--- src/ca/Makefile.Vx | 3 -- src/db/Makefile.Unix | 10 +---- src/db/Makefile.Vx | 3 -- src/dbtools/Makefile.Unix | 12 ++---- src/dbtools/Makefile.Vx | 4 +- src/devOpt/Makefile.Vx | 3 -- src/iocCore/Makefile.Vx | 33 +++------------- src/libCom/Makefile.Unix | 13 ++----- src/libCom/Makefile.Vx | 5 +-- src/libvxWorks/Makefile.Vx | 2 +- src/misc/Makefile.Vx | 3 -- src/rec/Makefile.Vx | 3 -- src/rsrv/Makefile.Vx | 6 --- src/sequencer/Makefile.Unix | 10 ++--- src/sequencer/Makefile.Vx | 6 +-- src/util/Makefile.Unix | 2 - src/util/Makefile.Vx | 6 --- 22 files changed, 36 insertions(+), 240 deletions(-) diff --git a/Makefile b/Makefile index e9dc53efb..c9ee0615f 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,9 @@ # install because the release.% syntax is illegal. # # $Log$ +# Revision 1.15 1994/09/08 17:25:39 mcn +# Changed clean to tools/Clean. Added "uninstall" dependency. +# # Revision 1.14 1994/09/07 20:42:19 jba # Minor changes # @@ -35,48 +38,6 @@ include $(EPICS)/config/CONFIG_SITE all: install -pre_build: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - -build_libs: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - -install_libs: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - -build_prod: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - -install_prod: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - -install_man: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - -install_includes: - @(for ARCH in ${BUILD_ARCHS}; \ - do \ - ${MAKE} ${MFLAGS} $@.$$ARCH; \ - done) - build: @(for ARCH in ${BUILD_ARCHS}; \ do \ @@ -133,36 +94,6 @@ dirs.%: @echo $*: Creating Directories @tools/MakeDirs $* -pre_build.%: dirs.% - @echo $*: Performing Pre Build - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs pre_build - - -build_libs.%: dirs.% - @echo $*: Building Libraries - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs build_libs - - -install_libs.%: dirs.% - @echo $*: Installing Libraries - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs install_libs - -build_prod.%: dirs.% - @echo $*: Building - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs build_prod - -install_prod.%: dirs.% - @echo $*: Building - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs install_prod - -install_man.%: dirs.% - @echo $*: Building - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs install_man - -install_includes.%: dirs.% - @echo $*: Building - @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs install_includes - build.%: dirs.% @echo $*: Building @${MAKE} ${MFLAGS} ARCH=$* -f Makefile.subdirs build diff --git a/Makefile.subdirs b/Makefile.subdirs index 6570fa37a..017b0be4e 100644 --- a/Makefile.subdirs +++ b/Makefile.subdirs @@ -5,6 +5,9 @@ # by Matthew Needes and Mike Bordua # # $Log$ +# Revision 1.12 1994/09/08 17:25:41 mcn +# Changed clean to tools/Clean. Added "uninstall" dependency. +# # Revision 1.11 1994/09/07 19:15:19 jba # Modified to eork with extensions and do depends # @@ -24,62 +27,6 @@ include $(EPICS)/config/CONFIG_BASE all: build -pre_build: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - -build_libs: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - -install_libs: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - -build_prod: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - -install_prod: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - -install_man: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - -install_includes: - @(for DIR in ${DIRS}; \ - do \ - TMP=`pwd`; echo "${T_A}: $@: $$DIR"; \ - cd $$DIR/O.${T_A}; ${MAKE} ${MFLAGS} $@; \ - cd $$TMP; \ - done) - build: @(for DIR in ${DIRS}; \ do \ diff --git a/src/as/Makefile.Unix b/src/as/Makefile.Unix index a88181d7f..c4edcc0d2 100644 --- a/src/as/Makefile.Unix +++ b/src/as/Makefile.Unix @@ -19,7 +19,7 @@ LIBOBJS = asLib.o LIBNAME = libAs.a PROD = ascheck -all: install_libs install +include $(EPICS)/config/RULES.Unix # Extra rule since asLib_lex.c is included in asLib.c # In my opinion, these objects should really be built @@ -27,9 +27,5 @@ all: install_libs install asLib.o: asLib_lex.c ../asLibRoutines.c clean:: - rm -f asLib.c asLib_lex.c ascheck + @$(RM) asLib.c asLib_lex.c -include $(EPICS)/config/RULES.Unix - -%: %.o $(DEPLIBS) - $(LINK.c) -o $@ $< $(LDLIBS) diff --git a/src/as/Makefile.Vx b/src/as/Makefile.Vx index 8118e6bd4..90e11a404 100644 --- a/src/as/Makefile.Vx +++ b/src/as/Makefile.Vx @@ -16,8 +16,7 @@ include $(EPICS)/config/RULES.Vx asLib.o: asLib_lex.c ../asLibRoutines.c clean:: - @rm -f asLib_lex.c asLibrary asLib.c - + @$(RM) asLib_lex.c asLib.c asLibrary : $(OBJS) $(RM) $@ diff --git a/src/ca/Makefile.Unix b/src/ca/Makefile.Unix index e8adb154b..cf80e6439 100644 --- a/src/ca/Makefile.Unix +++ b/src/ca/Makefile.Unix @@ -15,7 +15,7 @@ SRCS = \ ../syncgrp.c ../if_depen.c ../netdb_depen.c ../bsd_depen.c \ ../posix_depen.c ../caRepeater.c -OBJS = +OBJS = caRepeater.o LIBOBJS = \ iocinf.o access.o test_event.o service.o flow_control.o repeater.o \ @@ -27,8 +27,3 @@ PROD = caRepeater include $(EPICS)/config/RULES.Unix -$(PROD): $(OBJS) $(DEPLIBS) - -%: %.o - $(LINK.c) -o $@ $< $(LDLIBS) - diff --git a/src/ca/Makefile.Vx b/src/ca/Makefile.Vx index e649abe76..e7d523730 100644 --- a/src/ca/Makefile.Vx +++ b/src/ca/Makefile.Vx @@ -17,9 +17,6 @@ PROD = caLib include $(EPICS)/config/RULES.Vx -clean:: - rm -f caLib - caLib: $(OBJS) $(RM) $@ $(LINK.c) $@ $(OBJS) $(LDLIBS) diff --git a/src/db/Makefile.Unix b/src/db/Makefile.Unix index 09ef23223..9ebe79cfd 100644 --- a/src/db/Makefile.Unix +++ b/src/db/Makefile.Unix @@ -26,24 +26,18 @@ LIBNAME = libDb.a PROD = dbta dbl dbls atdb -all: install +include $(EPICS)/config/RULES.Unix atdb: atdb.o atdb_yacc.o $(LINK.c) -o $@ atdb.o atdb_yacc.o $(LDLIBS) - # Extra rule since atdb_lex.c is included in atdb_yacc.c # In my opinion, these objects should really be built # independently. atdb_yacc.o: atdb_lex.c clean:: - /bin/rm -f atdb_lex.c atdb_yacc.c $(PROD) - -include $(EPICS)/config/RULES.Unix + @$(RM) atdb_lex.c atdb_yacc.c -%: %.o $(DEPLIBS) - $(LINK.c) -o $@ $< $(LDLIBS) - diff --git a/src/db/Makefile.Vx b/src/db/Makefile.Vx index 8cd34b2fd..17764de8a 100644 --- a/src/db/Makefile.Vx +++ b/src/db/Makefile.Vx @@ -20,9 +20,6 @@ PROD = initHooks.o dbLib include $(EPICS)/config/RULES.Vx -clean:: - @rm -f dbLib - dbLib: $(OBJSdbLib) $(RM) $@ $(LINK.c) $@ $(OBJSdbLib) $(LDLIBS) diff --git a/src/dbtools/Makefile.Unix b/src/dbtools/Makefile.Unix index cf0c18624..0bdde2f2d 100644 --- a/src/dbtools/Makefile.Unix +++ b/src/dbtools/Makefile.Unix @@ -14,23 +14,19 @@ OBJS = dbVarSub.o dbLoadTemplate.o dbLoadRecords.o LIBOBJS = PROD = subtool dbLoadTemplate -all: install +include $(EPICS)/config/RULES.Unix dbLoadTemplate.o: dbLoadTemplate_lex.c dbLoadRecords.o: dbLoadRecords_lex.c -subtool: dbLoadTemplate_lex.c subtool: dbLoadTemplate.c dbLoadTemplate_lex.c dbVarSub.o $(RM) $@ $(LINK.c) $(CFLAGS) -DSUB_TOOL -o subtool dbLoadTemplate.c dbVarSub.o -s -clean:: - rm -f dbLoadTemplate_lex.c dbLoadTemplate.c dbLoadRecords_lex.c \ - dbLoadRecords.c subtool dbLoadTemplate - -include $(EPICS)/config/RULES.Unix - dbLoadTemplate: $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) -lDb +clean:: + @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c dbLoadRecords_lex.c \ + dbLoadRecords.c diff --git a/src/dbtools/Makefile.Vx b/src/dbtools/Makefile.Vx index 06f60b859..b665381dd 100644 --- a/src/dbtools/Makefile.Vx +++ b/src/dbtools/Makefile.Vx @@ -24,8 +24,8 @@ subtool: dbLoadTemplate.c dbLoadTemplate_lex.c dbVarSub.o $(LINK.c) $(CFLAGS) -DSUB_TOOL -o subtool dbLoadTemplate.c dbVarSub.o -s clean:: - rm -f dbLoadTemplate_lex.c dbLoadTemplate.c dbLoadRecords_lex.c \ - dbLoadRecords.c subtool dbLoadTemplate dbSubs + @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c dbLoadRecords_lex.c \ + dbLoadRecords.c dbSubs: $(OBJS) $(RM) $@ diff --git a/src/devOpt/Makefile.Vx b/src/devOpt/Makefile.Vx index 3f7c2aadc..9f7b4afe5 100644 --- a/src/devOpt/Makefile.Vx +++ b/src/devOpt/Makefile.Vx @@ -21,9 +21,6 @@ OBJS = \ include $(EPICS)/config/RULES.Vx -clean:: - @rm devLibOpt - devLibOpt: $(OBJS) $(RM) $@ $(LINK.c) $@ $(OBJS) $(LDLIBS) diff --git a/src/iocCore/Makefile.Vx b/src/iocCore/Makefile.Vx index 12d28ca1a..e7f715f24 100644 --- a/src/iocCore/Makefile.Vx +++ b/src/iocCore/Makefile.Vx @@ -6,8 +6,6 @@ LINK.c=$(LD) $(LDFLAGS) SRCS= -IOC_CORE = $(INSTALL_BIN)/$(T_A)/iocCore - IOC_CORE_OBJS = \ $(INSTALL_BIN)/$(T_A)/asLibrary \ $(INSTALL_BIN)/$(T_A)/dbLib \ @@ -18,36 +16,17 @@ IOC_CORE_OBJS = \ $(INSTALL_BIN)/$(T_A)/miscLib \ $(INSTALL_BIN)/$(T_A)/dbSubs +PROD = iocCore vxWorks vxWorks.sym include $(EPICS)/config/RULES.Vx -build_libs build_prod build \ -install_libs install_prod install: installVX iocCore +vxWorks: $(VX_IMAGE) + @$(INSTALL) -m 444 $? $@ -clean:: rm_iocCore +vxWorks.sym: $(VX_IMAGE_SYM) + @$(INSTALL) -m 444 $? $@ -installVX: $(EPICS_VX_IMAGE) $(EPICS_VX_IMAGE_SYM) - -$(INSTALL_BIN): - mkdir $(INSTALL_BIN) - -$(INSTALL_BIN)/$(T_A): $(INSTALL_BIN) - mkdir $(INSTALL_BIN)/$(T_A) - -$(EPICS_VX_IMAGE): $(VX_IMAGE) $(INSTALL_BIN) $(INSTALL_BIN)/$(T_A) - @echo "Installing $@" - @install -m 444 $(VX_IMAGE) $@ - -$(EPICS_VX_IMAGE_SYM): $(VX_IMAGE_SYM) $(INSTALL_BIN) $(INSTALL_BIN)/$(T_A) - @echo "Installing $@" - @install -m 444 $(VX_IMAGE_SYM) $@ - -rm_iocCore: - $(RM) $(IOC_CORE) - -iocCore: $(IOC_CORE) - -$(IOC_CORE): $(IOC_CORE_OBJS) +iocCore: $(IOC_CORE_OBJS) $(LINK.c) $@ $(IOC_CORE_OBJS) @what $@ diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix index 805018eb6..a4b08a409 100644 --- a/src/libCom/Makefile.Unix +++ b/src/libCom/Makefile.Unix @@ -13,8 +13,6 @@ SRCS = \ ../nextFieldSubr.c ../postfix.c ../sydSubr.c ../sydSubrCA.c \ ../sydSubrCF.c ../sydSubrSSF.c ../tsSubr.c errSymTbl.c ../errInc.c -OBJS = - LIBOBJS = \ tsSubr.o arAccessLib.o arCSCheck.o arChanIO.o bfSubr.o bucketLib.o \ calcPerform.o cmdSubr.o cvtFast.o cvtNumbers.o ellLib.o \ @@ -25,17 +23,15 @@ LIBOBJS = \ LIBNAME = libCom.a -#PROD = cvtTest tsTest sydTest +TARGET = cvtTest tsTest sydTest -all: install_libs install - -build: errSymTbl.o errInc.o +include $(EPICS)/config/RULES.Unix errSymTbl.o: errSymTbl.c errInc.o $(COMPILE.c) -o $@ $< errSymTbl.c errInc.o: errInc.c - @/bin/rm -f errInc.o + @$(RM) errInc.o @$(EPICS_BASE)/tools/blderrSymTbl; errInc.c: @@ -53,6 +49,5 @@ sydTest: sydSubr.o $(LINK.c) -o $@ sydSubr.o -lCom -lca -lDb -lCom -lm -s clean:: - rm -f cvtTest sydTest tsTest errInc.c errSymTbl.c + @$(RM) errInc.c errSymTbl.c -include $(EPICS)/config/RULES.Unix diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx index 63be67068..8786ae30d 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -28,13 +28,12 @@ PROD = libCom libCom1 libCom2 include $(EPICS)/config/RULES.Vx clean:: - @rm -f errInc.c errSymTbl.c libCom - + @$(RM) errInc.c errSymTbl.c build: errSymTbl.o errInc.o errSymTbl.c errInc.o: errInc.c - @/bin/rm -f errInc.o + @$(RM) errInc.o @$(EPICS_BASE)/tools/blderrSymTbl errInc.c: ../errInc.c diff --git a/src/libvxWorks/Makefile.Vx b/src/libvxWorks/Makefile.Vx index 42d116798..5386d4d94 100644 --- a/src/libvxWorks/Makefile.Vx +++ b/src/libvxWorks/Makefile.Vx @@ -12,7 +12,7 @@ PROD = vxComLib include $(EPICS)/config/RULES.Vx clean:: - @rm -f vxComLib + @$(RM) vxComLib vxComLib: $(OBJS) $(RM) $@ diff --git a/src/misc/Makefile.Vx b/src/misc/Makefile.Vx index 5bdbdcdcb..fc7e9cd5f 100644 --- a/src/misc/Makefile.Vx +++ b/src/misc/Makefile.Vx @@ -10,9 +10,6 @@ PROD = miscLib include $(EPICS)/config/RULES.Vx -clean:: - @rm -f miscLib - miscLib: $(OBJS) $(RM) $@ $(LINK.c) $@ $(OBJS) $(LDLIBS) diff --git a/src/rec/Makefile.Vx b/src/rec/Makefile.Vx index 458b3f03c..96e89cbda 100644 --- a/src/rec/Makefile.Vx +++ b/src/rec/Makefile.Vx @@ -30,9 +30,6 @@ PROD = recSup include $(EPICS)/config/RULES.Vx -clean:: - @rm -f recSup - $(PROD): $(OBJS) $(RM) $@ $(LINK.c) $@ $(OBJS) $(LDLIBS) diff --git a/src/rsrv/Makefile.Vx b/src/rsrv/Makefile.Vx index a65a7fd7a..f14b7f1de 100644 --- a/src/rsrv/Makefile.Vx +++ b/src/rsrv/Makefile.Vx @@ -16,9 +16,6 @@ PROD = dbgLib rsrvLib include $(EPICS)/config/RULES.Vx -clean:: - @rm -f dbgLib rsrvLib - dbgLib: $(OBJS) globalsource.o $(RM) $@ $(LINK.c) $@ $(OBJS) globalsource.o $(LDLIBS) @@ -27,6 +24,3 @@ rsrvLib: $(OBJS) $(RM) $@ $(LINK.c) $@ $(OBJS) $(LDLIBS) - -clean:: - rm -f dbgLib rsrvLib diff --git a/src/sequencer/Makefile.Unix b/src/sequencer/Makefile.Unix index 686eeb8e6..aa6d3b4a0 100644 --- a/src/sequencer/Makefile.Unix +++ b/src/sequencer/Makefile.Unix @@ -11,11 +11,9 @@ SRCS = ../snc_main.c ../parse.c ../phase2.c ../gen_ss_code.c \ OBJS = snc_main.o parse.o phase2.o gen_ss_code.o \ gen_tables.o sncVersion.o snc.o snc_lex.o -LIBOBJS = - PROD = snc -all: install +include $(EPICS)/config/RULES.Unix # # The generated lex file includes snc.h @@ -23,13 +21,11 @@ all: install snc_lex.c: snc.h sncVersion.c: ../Version - /bin/rm -f sncVersion.c + $(RM) sncVersion.c sh ../makeVersion ../Version > sncVersion.c clean:: - rm -f y.output sncVersion.c snc_lex.c snc.c snc.h snc - -include $(EPICS)/config/RULES.Unix + @$(RM) y.output sncVersion.c snc_lex.c snc.c snc.h $(PROD): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/src/sequencer/Makefile.Vx b/src/sequencer/Makefile.Vx index d959db898..20dc4217e 100644 --- a/src/sequencer/Makefile.Vx +++ b/src/sequencer/Makefile.Vx @@ -17,14 +17,12 @@ PROD = seq include $(EPICS)/config/RULES.Vx clean:: - rm -f seq seqVersion.c - + @$(RM) seqVersion.c seq: $(OBJS) $(RM) $@ $(LINK.c) $@ $(OBJS) $(LDLIBS) - seqVersion.c: ../Version - /bin/rm -f seqVersion.c + $(RM) seqVersion.c sh ../makeSeqVersion ../Version > seqVersion.c diff --git a/src/util/Makefile.Unix b/src/util/Makefile.Unix index 73370bc80..cd203b34c 100644 --- a/src/util/Makefile.Unix +++ b/src/util/Makefile.Unix @@ -36,5 +36,3 @@ PROD = \ include $(EPICS)/config/RULES.Unix -%: %.o $(DEPLIBS) - $(LINK.c) -o $@ $< $(LDLIBS) diff --git a/src/util/Makefile.Vx b/src/util/Makefile.Vx index ce781241b..edb5dfeeb 100644 --- a/src/util/Makefile.Vx +++ b/src/util/Makefile.Vx @@ -3,14 +3,8 @@ include Target.include include $(EPICS)/config/CONFIG_BASE SRCS = ../ca_test.c ../calcTest.c ../recordTest.c -OBJS = - -LIBOBJS = TARGETS = ca_test calcTest recordTest include $(EPICS)/config/RULES.Vx -%: %.o - $(LINK.c) $@ $< $(LDLIBS) -