From 2b59fe270f4b8d4496078dfa87bfc01e3fceaf85 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 4 Feb 2000 15:06:51 +0000 Subject: [PATCH] Modified OBJS build. --- src/db/Makefile | 2 - src/dev/softDev/Makefile | 2 +- src/dev/testDev/Makefile | 2 +- src/libCom/test/Makefile | 6 +- src/makeBaseApp/top/configure/RULES | 3 + src/rec/Makefile | 80 ++++++++++++-------------- src/registry/Makefile | 4 +- src/util/Makefile | 13 ++--- src/vxWorks/dev/apsDev/Makefile | 2 +- src/vxWorks/dev/atDev/Makefile | 2 +- src/vxWorks/dev/compumotorDev/Makefile | 2 +- src/vxWorks/dev/gpibDev/Makefile | 2 +- src/vxWorks/dev/joergerDev/Makefile | 2 +- src/vxWorks/devOpt/Makefile | 2 +- src/vxWorks/drv/ansi/Makefile | 4 +- src/vxWorks/drv/old/Makefile | 2 +- 16 files changed, 59 insertions(+), 71 deletions(-) diff --git a/src/db/Makefile b/src/db/Makefile index 7af889945..04ce5aabd 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -60,8 +60,6 @@ LIBRARY = dbLib include $(TOP)/configure/RULES -$(LIBOBJS_HOST): dbCommon.h - dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd $(RM) $@ $(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(HOSTEXE) \ diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile index 6fbffda51..f99001fe0 100644 --- a/src/dev/softDev/Makefile +++ b/src/dev/softDev/Makefile @@ -28,7 +28,7 @@ SRCS += devSiSoft.c SRCS += devSoSoft.c SRCS += devWfSoft.c -OBJS_IOC = $(SRCS:%.c=%.o) +OBJS_IOC = $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile index 1743e13a1..d5a06b529 100644 --- a/src/dev/testDev/Makefile +++ b/src/dev/testDev/Makefile @@ -14,6 +14,6 @@ SRCS += devSiTestAsyn.c SRCS += devSoTestAsyn.c SRCS += devWfTestAsyn.c -OBJS_IOC = $(SRCS:%.c=%.o) +OBJS_IOC = $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile index 9a5b82d45..009872b5b 100644 --- a/src/libCom/test/Makefile +++ b/src/libCom/test/Makefile @@ -6,15 +6,15 @@ PROD_LIBS += Com semBinaryTestHost_SRCS += semBinaryTestMain.c semBinaryTest.c PROD += semBinaryTestHost -OBJS_IOC += semBinaryTest$(OBJ) +OBJS_IOC += semBinaryTest semMutexTestHost_SRCS += semMutexTestMain.c semMutexTest.c PROD += semMutexTestHost -OBJS_IOC += semMutexTest$(OBJ) +OBJS_IOC += semMutexTest threadTestHost_SRCS += threadTestMain.c threadTest.c PROD += threadTestHost -OBJS_IOC += threadTest$(OBJ) +OBJS_IOC += threadTest #fdmgrTest_SRCS += fdmgrTest.c #PROD += fdmgrTest diff --git a/src/makeBaseApp/top/configure/RULES b/src/makeBaseApp/top/configure/RULES index 44f554e7e..ffee54a71 100644 --- a/src/makeBaseApp/top/configure/RULES +++ b/src/makeBaseApp/top/configure/RULES @@ -1,2 +1,5 @@ #CONFIG include $(EPICS_BASE)/configure/RULES + +# Library should be rebuilt because LIBOBJS may have changed. +$(LIBNAME): ../Makefile diff --git a/src/rec/Makefile b/src/rec/Makefile index 326c7f077..af8b40fec 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -45,49 +45,43 @@ RECTYPES += subArrayRecord.h RECTYPES += timerRecord.h RECTYPES += waveformRecord.h -OBJS_IOC += aaiRecord.o -OBJS_IOC += aaoRecord.o -OBJS_IOC += aiRecord.o -OBJS_IOC += aoRecord.o -OBJS_IOC += biRecord.o -OBJS_IOC += boRecord.o -OBJS_IOC += calcRecord.o -OBJS_IOC += calcoutRecord.o -OBJS_IOC += compressRecord.o -OBJS_IOC += dfanoutRecord.o -OBJS_IOC += egRecord.o -OBJS_IOC += egeventRecord.o -OBJS_IOC += erRecord.o -OBJS_IOC += ereventRecord.o -OBJS_IOC += eventRecord.o -OBJS_IOC += fanoutRecord.o -OBJS_IOC += gsubRecord.o -OBJS_IOC += histogramRecord.o -OBJS_IOC += longinRecord.o -OBJS_IOC += longoutRecord.o -OBJS_IOC += mbbiRecord.o -OBJS_IOC += mbbiDirectRecord.o -OBJS_IOC += mbboRecord.o -OBJS_IOC += mbboDirectRecord.o -OBJS_IOC += permissiveRecord.o -OBJS_IOC += pulseCounterRecord.o -OBJS_IOC += pulseDelayRecord.o -OBJS_IOC += pulseTrainRecord.o -OBJS_IOC += selRecord.o -OBJS_IOC += seqRecord.o -OBJS_IOC += stateRecord.o -OBJS_IOC += stringinRecord.o -OBJS_IOC += stringoutRecord.o -OBJS_IOC += subRecord.o -OBJS_IOC += subArrayRecord.o -OBJS_IOC += timerRecord.o -OBJS_IOC += waveformRecord.o +OBJS_IOC += aaiRecord +OBJS_IOC += aaoRecord +OBJS_IOC += aiRecord +OBJS_IOC += aoRecord +OBJS_IOC += biRecord +OBJS_IOC += boRecord +OBJS_IOC += calcRecord +OBJS_IOC += calcoutRecord +OBJS_IOC += compressRecord +OBJS_IOC += dfanoutRecord +OBJS_IOC += egRecord +OBJS_IOC += egeventRecord +OBJS_IOC += erRecord +OBJS_IOC += ereventRecord +OBJS_IOC += eventRecord +OBJS_IOC += fanoutRecord +OBJS_IOC += gsubRecord +OBJS_IOC += histogramRecord +OBJS_IOC += longinRecord +OBJS_IOC += longoutRecord +OBJS_IOC += mbbiRecord +OBJS_IOC += mbbiDirectRecord +OBJS_IOC += mbboRecord +OBJS_IOC += mbboDirectRecord +OBJS_IOC += permissiveRecord +OBJS_IOC += pulseCounterRecord +OBJS_IOC += pulseDelayRecord +OBJS_IOC += pulseTrainRecord +OBJS_IOC += selRecord +OBJS_IOC += seqRecord +OBJS_IOC += stateRecord +OBJS_IOC += stringinRecord +OBJS_IOC += stringoutRecord +OBJS_IOC += subRecord +OBJS_IOC += subArrayRecord +OBJS_IOC += timerRecord +OBJS_IOC += waveformRecord include $(TOP)/configure/RULES -aaiRecord.o : aaiRecord.h - -%Record.o : %Record.h - - -$(OBJS_IOC) : $(RECTYPES) diff --git a/src/registry/Makefile b/src/registry/Makefile index faa49207f..8e18e5161 100644 --- a/src/registry/Makefile +++ b/src/registry/Makefile @@ -20,9 +20,9 @@ registryLibrary_SRCS += registryRecordType.c registryLibrary_SRCS += registryDeviceSupport.c registryLibrary_SRCS += registryDriverSupport.c -PROD = registerRecordDeviceDriver.o - LIBRARY = registryLibrary +OBJS = registerRecordDeviceDriver + include $(TOP)/configure/RULES diff --git a/src/util/Makefile b/src/util/Makefile index 9e8643ccf..45a14ddb7 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -2,23 +2,18 @@ TOP=../.. include $(TOP)/configure/CONFIG -CMPLR = STRICT - -# DEFAULT Unix needs lib m, every system needs libs ca & Com: -SYS_PROD_LIBS_DEFAULT := m -SYS_PROD_LIBS_WIN32 := -nil- PROD_LIBS := ca Com + # # Added winmm user32 for the non-dll build # -SRCS_Host += ca_test_main.c SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 PROD_DEFAULT = ca_test iocLogServer startCArepeater PROD_WIN32 = ca_test iocLogServer -PRODIOC_vxWorks = ca_test.o -ca_test_SRCS = ca_test.c -TARGETS = ca_test.o +ca_test_SRCS = ca_test_main.c ca_test.c + +OBJS = ca_test SCRIPTS_solaris := S99logServer S99caRepeater diff --git a/src/vxWorks/dev/apsDev/Makefile b/src/vxWorks/dev/apsDev/Makefile index 991b00b09..d1f9e12a4 100644 --- a/src/vxWorks/dev/apsDev/Makefile +++ b/src/vxWorks/dev/apsDev/Makefile @@ -7,7 +7,7 @@ INC += devApsEr.h SRCS += devApsEg.c SRCS += devApsEr.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/vxWorks/dev/atDev/Makefile b/src/vxWorks/dev/atDev/Makefile index 9fbdef39b..2497ca5e1 100644 --- a/src/vxWorks/dev/atDev/Makefile +++ b/src/vxWorks/dev/atDev/Makefile @@ -5,7 +5,7 @@ include $(TOP)/configure/CONFIG SRCS += devAt5Vxi.c SRCS += devAt8Fp.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/vxWorks/dev/compumotorDev/Makefile b/src/vxWorks/dev/compumotorDev/Makefile index 70dbb588c..93d95a06e 100644 --- a/src/vxWorks/dev/compumotorDev/Makefile +++ b/src/vxWorks/dev/compumotorDev/Makefile @@ -4,7 +4,7 @@ include $(TOP)/configure/CONFIG SRCS += devSmCompumotor1830.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/vxWorks/dev/gpibDev/Makefile b/src/vxWorks/dev/gpibDev/Makefile index 241f8925f..32d94027a 100644 --- a/src/vxWorks/dev/gpibDev/Makefile +++ b/src/vxWorks/dev/gpibDev/Makefile @@ -6,7 +6,7 @@ INC += devCommonGpib.h SRCS += devCommonGpib.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/vxWorks/dev/joergerDev/Makefile b/src/vxWorks/dev/joergerDev/Makefile index a793bbfb0..e188e3147 100644 --- a/src/vxWorks/dev/joergerDev/Makefile +++ b/src/vxWorks/dev/joergerDev/Makefile @@ -4,7 +4,7 @@ include $(TOP)/configure/CONFIG SRCS += devWfJoergerVtr1.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/vxWorks/devOpt/Makefile b/src/vxWorks/devOpt/Makefile index a32b7ed3a..f0434cf8b 100644 --- a/src/vxWorks/devOpt/Makefile +++ b/src/vxWorks/devOpt/Makefile @@ -12,7 +12,7 @@ SRCS+= devXxDc5009Gpib.c SRCS+= devXxK263Gpib.c SRCS+= devXxSkeletonGpib.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) LIBRARY_vxWorks += devLibOpt diff --git a/src/vxWorks/drv/ansi/Makefile b/src/vxWorks/drv/ansi/Makefile index 4d8397c09..a2fbd3938 100644 --- a/src/vxWorks/drv/ansi/Makefile +++ b/src/vxWorks/drv/ansi/Makefile @@ -24,9 +24,7 @@ SRCS += drvStc.c #SRCS += drvVmic2534.c -OBJS_vxWorks += $(SRCS:%.c=%.o) - -MAN3 = drvEpvxi.3 +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/vxWorks/drv/old/Makefile b/src/vxWorks/drv/old/Makefile index af084247f..0a83b48cb 100644 --- a/src/vxWorks/drv/old/Makefile +++ b/src/vxWorks/drv/old/Makefile @@ -43,7 +43,7 @@ SRCS += drvXy220.c SRCS += drvXy240.c SRCS += drvXy566.c -OBJS_vxWorks += $(SRCS:%.c=%.o) +OBJS_vxWorks += $(SRCS:%.c=%) include $(TOP)/configure/RULES