From 927446c261202045f58ee9baedf8ea7455f0b22d Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 31 Mar 2003 14:04:49 +0000 Subject: [PATCH] Makefile changes so that rec and dev build on win32 --- src/dev/softDev/Makefile | 52 ++++++++++++++++++++-------------------- src/dev/testDev/Makefile | 26 ++++++++++---------- src/misc/Makefile | 2 +- src/rec/Makefile | 2 +- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile index 7a2746437..836b33258 100644 --- a/src/dev/softDev/Makefile +++ b/src/dev/softDev/Makefile @@ -11,36 +11,36 @@ TOP=../../.. include $(TOP)/configure/CONFIG -SRCS += devAiSoft.c -SRCS += devAiSoftRaw.c -SRCS += devAoSoft.c -SRCS += devAoSoftRaw.c -SRCS += devBiSoft.c -SRCS += devBiSoftRaw.c -SRCS += devBoSoft.c -SRCS += devBoSoftRaw.c -SRCS += devEventSoft.c -SRCS += devHistogramSoft.c -SRCS += devLiSoft.c -SRCS += devLoSoft.c -SRCS += devMbbiDirectSoft.c -SRCS += devMbbiDirectSoftRaw.c -SRCS += devMbbiSoft.c -SRCS += devMbbiSoftRaw.c -SRCS += devMbboDirectSoft.c -SRCS += devMbboDirectSoftRaw.c -SRCS += devMbboSoft.c -SRCS += devMbboSoftRaw.c -SRCS += devSASoft.c -SRCS += devSiSoft.c -SRCS += devSoSoft.c -SRCS += devWfSoft.c +LIBSRCS += devAiSoft.c +LIBSRCS += devAiSoftRaw.c +LIBSRCS += devAoSoft.c +LIBSRCS += devAoSoftRaw.c +LIBSRCS += devBiSoft.c +LIBSRCS += devBiSoftRaw.c +LIBSRCS += devBoSoft.c +LIBSRCS += devBoSoftRaw.c +LIBSRCS += devEventSoft.c +LIBSRCS += devHistogramSoft.c +LIBSRCS += devLiSoft.c +LIBSRCS += devLoSoft.c +LIBSRCS += devMbbiDirectSoft.c +LIBSRCS += devMbbiDirectSoftRaw.c +LIBSRCS += devMbbiSoft.c +LIBSRCS += devMbbiSoftRaw.c +LIBSRCS += devMbboDirectSoft.c +LIBSRCS += devMbboDirectSoftRaw.c +LIBSRCS += devMbboSoft.c +LIBSRCS += devMbboSoftRaw.c +LIBSRCS += devSASoft.c +LIBSRCS += devSiSoft.c +LIBSRCS += devSoSoft.c +LIBSRCS += devWfSoft.c LIBRARY_IOC += softDevIoc -softDevIoc_LIBS += dbIoc +softDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com # For R3.13 compatability -OBJS_vxWorks = $(SRCS:%.c=%) +OBJS_vxWorks = $(LIBSRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile index b05bcd1b2..d82a6e46e 100644 --- a/src/dev/testDev/Makefile +++ b/src/dev/testDev/Makefile @@ -11,22 +11,22 @@ TOP=../../.. include $(TOP)/configure/CONFIG -SRCS += devAiTestAsyn.c -SRCS += devAoTestAsyn.c -SRCS += devBiTestAsyn.c -SRCS += devBoTestAsyn.c -SRCS += devEventTestIoEvent.c -SRCS += devHistogramTestAsyn.c -SRCS += devMbbiTestAsyn.c -SRCS += devMbboTestAsyn.c -SRCS += devSiTestAsyn.c -SRCS += devSoTestAsyn.c -SRCS += devWfTestAsyn.c +LIBSRCS += devAiTestAsyn.c +LIBSRCS += devAoTestAsyn.c +LIBSRCS += devBiTestAsyn.c +LIBSRCS += devBoTestAsyn.c +LIBSRCS += devEventTestIoEvent.c +LIBSRCS += devHistogramTestAsyn.c +LIBSRCS += devMbbiTestAsyn.c +LIBSRCS += devMbboTestAsyn.c +LIBSRCS += devSiTestAsyn.c +LIBSRCS += devSoTestAsyn.c +LIBSRCS += devWfTestAsyn.c LIBRARY_IOC = testDevIoc -testDevIoc_LIBS += dbIoc +testDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com # For R3.13 compatability -OBJS_vxWorks = $(SRCS:%.c=%) +OBJS_vxWorks = $(LIBSRCS:%.c=%) include $(TOP)/configure/RULES diff --git a/src/misc/Makefile b/src/misc/Makefile index 7af28a536..4de54c8d6 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -23,7 +23,7 @@ LIBSRCS += asSubRecordFunctions.c LIBRARY_IOC = miscIoc miscIoc_RCS_WIN32 = miscIoc.rc -miscIoc_LIBS = dbStaticIoc dbIoc asIoc rsrvIoc registryIoc Com +miscIoc_LIBS = recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com # For R3.13 compatibility only OBJLIB_vxWorks=miscIoc diff --git a/src/rec/Makefile b/src/rec/Makefile index 0bc2f172a..259dfd2f1 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -82,7 +82,7 @@ LIBSRCS += waveformRecord.c LIBRARY_IOC += recIoc -recIoc_LIBS = dbStaticIoc registryIoc asIoc dbIoc ca Com +recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com # For R3.13 compatability OBJS_vxWorks = $(LIBSRCS:%.c=%)