From dd3de4d8f074bc538299417a5d7cf889668cdde5 Mon Sep 17 00:00:00 2001 From: Matt Needes Date: Tue, 23 Aug 1994 20:35:03 +0000 Subject: [PATCH] Added "all:" and "clean::" deps, changed flag usage, cleanup. --- src/as/Makefile.Vx | 5 +++++ src/ca/Makefile.Unix | 8 ++++++-- src/ca/Makefile.Vx | 5 +++++ src/db/Makefile.Unix | 11 ++++++++++- src/db/Makefile.Vx | 7 +++++-- src/dbtools/Makefile.Unix | 2 ++ src/dbtools/Makefile.Vx | 6 ++++-- src/dev/Makefile.Vx | 8 ++++++-- src/devOpt/Makefile.Vx | 5 +++-- src/drv/Makefile.Vx | 9 +++++---- src/libCom/Makefile.Unix | 2 ++ src/libCom/Makefile.Vx | 4 ++-- src/libvxWorks/Makefile.Vx | 5 +++++ src/misc/Makefile.Vx | 5 +++++ src/rec/Makefile.Vx | 7 ++++++- src/rsrv/Makefile.Vx | 8 +++++++- src/sequencer/Makefile.Unix | 5 +++-- src/sequencer/Makefile.Vx | 2 ++ src/toolsComm/antelope/Makefile.Unix | 9 +++++++-- src/toolsComm/flex/Makefile.Unix | 23 +++-------------------- src/util/Makefile.Unix | 12 ++++++++---- src/util/Makefile.Vx | 8 +++++--- 22 files changed, 106 insertions(+), 50 deletions(-) diff --git a/src/as/Makefile.Vx b/src/as/Makefile.Vx index 39f5500a5..4ef3a7a91 100644 --- a/src/as/Makefile.Vx +++ b/src/as/Makefile.Vx @@ -10,9 +10,14 @@ OBJS = LIBOBJS = asDbLib.o asCa.o asLib.o LIBNAME = asLibrary +all: install_libs + # Extra rule since asLib_lex.c is included in asLib.c # In my opinion, these objects should really be built # independently. asLib.o: asLib_lex.c ../asLibRoutines.c +clean:: + rm -f asLib_lex.c asLibrary + include $(EPICS)/config/RULES.Vx diff --git a/src/ca/Makefile.Unix b/src/ca/Makefile.Unix index 66c6c8124..683d4404e 100644 --- a/src/ca/Makefile.Unix +++ b/src/ca/Makefile.Unix @@ -2,9 +2,8 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_LDLIBS = -lm -s -USR_LDLIBS = USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO +USR_LDLIBS = -lca -lCom -lDb SRCS = \ ../iocinf.c ../access.c ../test_event.c ../service.c \ @@ -22,4 +21,9 @@ LIBNAME = libca.a TARGET = caRepeater +all: install_libs install + +clean:: + rm -f caRepeater + include $(EPICS)/config/RULES.Unix diff --git a/src/ca/Makefile.Vx b/src/ca/Makefile.Vx index 50a879bdd..0a5324afe 100644 --- a/src/ca/Makefile.Vx +++ b/src/ca/Makefile.Vx @@ -17,4 +17,9 @@ LIBOBJS = \ LIBNAME = caLib +all: install_libs + +clean:: + rm -f caLib + include $(EPICS)/config/RULES.Vx diff --git a/src/db/Makefile.Unix b/src/db/Makefile.Unix index 9ee652918..fcf5824f8 100644 --- a/src/db/Makefile.Unix +++ b/src/db/Makefile.Unix @@ -2,6 +2,8 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG +USR_LDLIBS = -lDb -lCom + SRCS = \ ../dbStaticLib.c \ atdb_lex.c \ @@ -19,8 +21,15 @@ LIBNAME = libDb.a TARGET = dbta atdb dbl dbls +all: install_libs install + atdb: atdb.o atdb_yacc.o - $(LINK.c) -o $@ $? $(LDLIBS) + $(LINK.c) -o $@ atdb.o atdb_yacc.o $(LDLIBS) + +dbta: $(LIBNAME) +atdb: $(LIBNAME) +dbl: $(LIBNAME) +dbls: $(LIBNAME) # Extra rule since atdb_lex.c is included in atdb_yacc.c # In my opinion, these objects should really be built diff --git a/src/db/Makefile.Vx b/src/db/Makefile.Vx index 6322fe5aa..ae184e069 100644 --- a/src/db/Makefile.Vx +++ b/src/db/Makefile.Vx @@ -2,8 +2,6 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -all: install - SRCS = \ ../dbAccess.c ../dbBkpt.c ../dbFastLinkConv.c ../dbLink.c \ ../dbStaticLib.c ../iocInit.c ../drvTS.c ../dbScan.c \ @@ -23,5 +21,10 @@ LIBNAME = dbLib TARGET = initHooks.o +all: install_libs + +clean:: + rm -f dbLib + include $(EPICS)/config/RULES.Vx diff --git a/src/dbtools/Makefile.Unix b/src/dbtools/Makefile.Unix index cef63ce79..aeadf3e3d 100644 --- a/src/dbtools/Makefile.Unix +++ b/src/dbtools/Makefile.Unix @@ -15,6 +15,8 @@ LIBOBJS = PROD = dbLoadTemplate TARGET = subtool +all: install + dbLoadTemplate.o: dbLoadTemplate_lex.c dbLoadRecords.o: dbLoadRecords_lex.c subtool: dbLoadTemplate_lex.c diff --git a/src/dbtools/Makefile.Vx b/src/dbtools/Makefile.Vx index 14d8e4cf1..12c3bc09f 100644 --- a/src/dbtools/Makefile.Vx +++ b/src/dbtools/Makefile.Vx @@ -10,9 +10,11 @@ LEXOPT = -L SRCS = ../dbVarSub.c dbLoadTemplate_lex.c dbLoadTemplate.c \ dbLoadRecords_lex.c dbLoadRecords.c OBJS = -LIBOBJS = dbVarSub.o dbLoadTemplate.o dbLoadRecords.o +LIBOBJS = dbVarSub.o dbLoadTemplate.o dbLoadRecords.o LIBNAME = dbSubs +all: install_libs install + dbLoadTemplate.o: dbLoadTemplate_lex.c dbLoadRecords.o: dbLoadRecords_lex.c subtool: dbLoadTemplate_lex.c @@ -23,7 +25,7 @@ subtool: dbLoadTemplate.c dbLoadTemplate_lex.c dbVarSub.o clean:: rm -f dbLoadTemplate_lex.c dbLoadTemplate.c dbLoadRecords_lex.c \ - dbLoadRecords.c subtool dbLoadTemplate + dbLoadRecords.c subtool dbLoadTemplate dbSubs include $(EPICS)/config/RULES.Vx diff --git a/src/dev/Makefile.Vx b/src/dev/Makefile.Vx index 169015926..646233feb 100644 --- a/src/dev/Makefile.Vx +++ b/src/dev/Makefile.Vx @@ -2,8 +2,7 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = -ansi -I../../drv -LDLIBS = +USR_INCLUDES = -I../../drv SRCS = \ ../devAiDvx2502.c ../devAiSoft.c ../devAiSoftRaw.c \ @@ -61,4 +60,9 @@ LIBOBJS = PROD = devSup +all: install + +clean:: + rm -f devSup + include $(EPICS)/config/RULES.Vx diff --git a/src/devOpt/Makefile.Vx b/src/devOpt/Makefile.Vx index eac2c57f7..23a5d530d 100644 --- a/src/devOpt/Makefile.Vx +++ b/src/devOpt/Makefile.Vx @@ -2,8 +2,7 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = -ansi -I../../drv -LDLIBS = +USR_INCLUDES = -I../../drv SRCS = \ ../devAnalytekGpib.c ../devXxDg535Gpib.c ../devXxSkeletonGpib.c \ @@ -22,4 +21,6 @@ LIBOBJS = TARGETS = +all: install + include $(EPICS)/config/RULES.Vx diff --git a/src/drv/Makefile.Vx b/src/drv/Makefile.Vx index 4698816f4..30c3c4efb 100644 --- a/src/drv/Makefile.Vx +++ b/src/drv/Makefile.Vx @@ -31,22 +31,23 @@ OBJS2 = drvPEPBitBus.o LIBOBJS = PROD1 = drvSup - PROD2 = drvSupPEP PRODS = $(PROD1) $(PROD2) +all: install + install: install_prods install_prods: $(PRODS) - $(INSTALL) $? $(EPICS_BASE_BIN)/$(T_A) + $(INSTALL) $(PRODS) $(EPICS_BASE_BIN)/$(T_A) build:: $(PROD1) $(PROD2) -drvSup: $(OBJS) $(OBJS1) +$(PROD1): $(OBJS) $(OBJS1) $(LINK.c) $@ $? $(LDLIBS) -drvSupPEP: $(OBJS) $(OBJS2) +$(PROD2): $(OBJS) $(OBJS2) $(LINK.c) $@ $? $(LDLIBS) include $(EPICS)/config/RULES.Vx diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix index 0de75055e..5701c6892 100644 --- a/src/libCom/Makefile.Unix +++ b/src/libCom/Makefile.Unix @@ -27,6 +27,8 @@ LIBNAME = libCom.a TARGET = cvtTest tsTest sydTest +all: install_libs install + build:: errSymTbl.o errInc.o errSymTbl.o: errSymTbl.c errInc.o diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx index 0a59b43b3..1273befbd 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -2,8 +2,6 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = -ansi - SRCS = \ ../calcPerform.c ../cmdSubr.c ../cvtBpt.c ../cvtFast.c \ ../cvtNumbers.c ../gpHashLib.c ../freeListLib.c ../ellLib.c \ @@ -30,6 +28,8 @@ LIBNAME = libCom.o LIBNAME1 = libCom1.o LIBNAME2 = libCom2.o +all: install_libs install + build_libs: $(LIBNAME) $(LIBNAME1) $(LIBNAME2) $(LIBNAME1): $(LIBOBJS1) diff --git a/src/libvxWorks/Makefile.Vx b/src/libvxWorks/Makefile.Vx index 0c7003fe0..d75e406bf 100644 --- a/src/libvxWorks/Makefile.Vx +++ b/src/libvxWorks/Makefile.Vx @@ -12,4 +12,9 @@ LIBOBJS = veclist.o iocLogClient.o LIBNAME = vxComLib +all: install_libs + +clean:: + rm -f vxComLib + include $(EPICS)/config/RULES.Vx diff --git a/src/misc/Makefile.Vx b/src/misc/Makefile.Vx index 6b007a84d..01cc059f3 100644 --- a/src/misc/Makefile.Vx +++ b/src/misc/Makefile.Vx @@ -12,4 +12,9 @@ LIBOBJS = epicsEnvParams.o epicsRelease.o LIBNAME = miscLib +all: install_libs + +clean:: + rm -f miscLib + include $(EPICS)/config/RULES.Vx diff --git a/src/rec/Makefile.Vx b/src/rec/Makefile.Vx index 1ac7974e5..04dd26217 100644 --- a/src/rec/Makefile.Vx +++ b/src/rec/Makefile.Vx @@ -2,7 +2,7 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = -I../../drv +USR_INCLUDES = -I../../drv SRCS = \ ../recAi.c ../recGsub.c ../recPulseDelay.c ../recAo.c \ @@ -30,4 +30,9 @@ LIBOBJS = \ PROD = recSup +all: install + +clean:: + rm -f recSup + include $(EPICS)/config/RULES.Vx diff --git a/src/rsrv/Makefile.Vx b/src/rsrv/Makefile.Vx index 3e15a0b19..1920efcc5 100644 --- a/src/rsrv/Makefile.Vx +++ b/src/rsrv/Makefile.Vx @@ -2,7 +2,8 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = -I../../ca -UUNIX +USR_INCLUDES = -I../../ca +USR_CFLAGS = -UUNIX SRCS = ../caserverio.c ../caservertask.c ../camsgtask.c ../camessage.c \ ../rsrv_init.c ../cast_server.c ../online_notify.c ../globalsource.c @@ -16,6 +17,8 @@ LIBOBJS = \ LIBNAME = dbgLib LIBNAME1 = rsrvLib +all: install_libs install + build_libs: $(LIBNAME) $(LIBNAME1) $(LIBNAME1): $(LIBOBJS) globalsource.o @@ -27,4 +30,7 @@ install: $(EPICS_BASE_LIB)/$(T_A)/$(LIBNAME1) $(EPICS_BASE_LIB)/$(T_A)/$(LIBNAME1): $(LIBNAME1) $(INSTALL) $(LIBNAME1) $@ +clean:: + rm -f dbgLib rsrvLib + include $(EPICS)/config/RULES.Vx diff --git a/src/sequencer/Makefile.Unix b/src/sequencer/Makefile.Unix index d58e7bfc8..2e06985ce 100644 --- a/src/sequencer/Makefile.Unix +++ b/src/sequencer/Makefile.Unix @@ -2,8 +2,7 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = -LDLIBS = -ll +USR_LDLIBS = -ll YACCOPT = -d -v SRCS = ../snc_main.c ../parse.c ../phase2.c ../gen_ss_code.c \ @@ -16,6 +15,8 @@ LIBOBJS = PROD = snc +all: install + # # The generated lex file includes snc.h # diff --git a/src/sequencer/Makefile.Vx b/src/sequencer/Makefile.Vx index f736fb46b..ed99799b1 100644 --- a/src/sequencer/Makefile.Vx +++ b/src/sequencer/Makefile.Vx @@ -16,6 +16,8 @@ LIBOBJS = PROD = seq +all: install + seqVersion.c: ../Version /bin/rm -f seqVersion.c sh ../makeSeqVersion ../Version > seqVersion.c diff --git a/src/toolsComm/antelope/Makefile.Unix b/src/toolsComm/antelope/Makefile.Unix index a198effc2..2cd6e3d5e 100644 --- a/src/toolsComm/antelope/Makefile.Unix +++ b/src/toolsComm/antelope/Makefile.Unix @@ -2,9 +2,9 @@ EPICS = ../../../../.. include Target.include include $(EPICS)/config/CONFIG -LDLIBS = -lm -s +CMPLR = OLD +USR_LDLIBS = -lm -s USR_CFLAGS = -D_NO_PROTO -CC = $(oldCC) SRCS = \ ../closure.c ../error.c ../lalr.c ../lr0.c ../main.c \ @@ -19,6 +19,11 @@ OBJS = \ PROD = antelope +all: install + pre_build: install +clean:: + rm -f antelope + include $(EPICS)/config/RULES.Unix diff --git a/src/toolsComm/flex/Makefile.Unix b/src/toolsComm/flex/Makefile.Unix index 459d3a6fe..2d3cfc434 100644 --- a/src/toolsComm/flex/Makefile.Unix +++ b/src/toolsComm/flex/Makefile.Unix @@ -2,15 +2,11 @@ EPICS = ../../../../.. include Target.include include $(EPICS)/config/CONFIG +CMPLR = OLD YACCOPT = -d - SKELETON_FILE=include/flex.skel.static - USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" - -LDLIBS = -s - -CC = $(oldCC) +USR_LDLIBS = -s SRCS = ../ccl.c ../dfa.c ../ecs.c ../gen.c ../main.c \ ../misc.c ../nfa.c parse.c ../scan.c ../sym.c \ @@ -24,22 +20,9 @@ OBJS = \ PROD = e_flex -# all :: $(PROD) - -# -# If you need parse.h, you must recompile parse.c -# -#parse.c:: -# mv y.tab.h parse.h - +all: install pre_build: install -#parse.h parse.c : parse.y -# rm -f parse.h parse.c -# $(YACC) -d parse.y -# @mv y.tab.c parse.c -# @mv y.tab.h parse.h - clean:: rm -f parse.c parse.h e_flex diff --git a/src/util/Makefile.Unix b/src/util/Makefile.Unix index 2088cc786..19a2fb59a 100644 --- a/src/util/Makefile.Unix +++ b/src/util/Makefile.Unix @@ -2,11 +2,10 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG +CMPLR = OLD USR_LDLIBS = -lm -s - -USR_CFLAGS = -DXWINDOWS -UvxWorks -I$(OPENWIN)/include - -CC = $(oldCC) +USR_INCLUDES = -I$(OPENWIN)/include +USR_CFLAGS = -DXWINDOWS -UvxWorks SRCS = \ ../apCreateShadow.c ../apStatusSync.c ../bfRing.c ../ca_test.c \ @@ -28,4 +27,9 @@ TARGETS = \ apCreateShadow apStatusSync bfRing ca_test calcTest cmdClient \ extrDoc iocLogServer racPrint recListProg recordTest startCArepeater +all: install_libs install + +clean:: + rm -f $(TARGETS) + include $(EPICS)/config/RULES.Unix diff --git a/src/util/Makefile.Vx b/src/util/Makefile.Vx index 6b301d6d3..d0ea8fd81 100644 --- a/src/util/Makefile.Vx +++ b/src/util/Makefile.Vx @@ -2,14 +2,16 @@ EPICS = ../../../.. include Target.include include $(EPICS)/config/CONFIG -USR_CFLAGS = - SRCS = ../ca_test.c ../calcTest.c ../recordTest.c - OBJS = LIBOBJS = TARGETS = ca_test calcTest recordTest +all: install + +clean:: + rm -f $(TARGETS) + include $(EPICS)/config/RULES.Vx