Modified OBJS build.

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) \

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
 

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

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

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

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)

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
 

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 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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