From 99ef10d0c3b0f802dd432d10294e54c014ec7b91 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 24 Jan 2000 21:10:02 +0000 Subject: [PATCH] new way to build --- src/as/Makefile | 29 +++++++++-- src/as/Makefile.Host | 30 ----------- src/as/Makefile.Ioc | 21 -------- src/dev/softDev/Makefile | 31 +++++++++++- src/dev/softDev/Makefile.Ioc | 35 ------------- src/dev/testDev/Makefile | 15 +++++- src/dev/testDev/Makefile.Ioc | 22 -------- src/rec/Makefile | 98 ++++++++++++++++++++++++++++++++++-- src/rec/Makefile.Host | 54 -------------------- src/rec/Makefile.Ioc | 55 -------------------- 10 files changed, 165 insertions(+), 225 deletions(-) delete mode 100644 src/as/Makefile.Host delete mode 100644 src/as/Makefile.Ioc delete mode 100644 src/dev/softDev/Makefile.Ioc delete mode 100644 src/dev/testDev/Makefile.Ioc delete mode 100644 src/rec/Makefile.Host delete mode 100644 src/rec/Makefile.Ioc diff --git a/src/as/Makefile b/src/as/Makefile index d56852bad..80a7b64c8 100644 --- a/src/as/Makefile +++ b/src/as/Makefile @@ -1,6 +1,29 @@ - TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +SRCS += asLib.c +asLibrary_SRCS += asDbLib.c +asLibrary_SRCS += asCa.c + +LIBRARY_Host += As +LIBRARY_Ioc += asLibrary + +# All systems link the libs As, Com, Db (and again Com ??), +# generic Unix needs also lib m: +# +SYS_PROD_LIBS_DEFAULT := m +SYS_PROD_LIBS_WIN32 := -nil- +PROD_LIBS := As Com Db Com + +PROD = ascheck + +include $(TOP)/configure/RULES + +# Extra rule since asLib_lex.c is included in asLib.c +# In my opinion, these objects should really be built +# independently. +asLib$(OBJ): asLib_lex.c ../asLibRoutines.c + +clean:: + @$(RM) asLib.c asLib_lex.c + diff --git a/src/as/Makefile.Host b/src/as/Makefile.Host deleted file mode 100644 index aac768da9..000000000 --- a/src/as/Makefile.Host +++ /dev/null @@ -1,30 +0,0 @@ - -TOP=../.. -include $(TOP)/configure/CONFIG - -USR_CFLAGS += -D_NO_PROTO - -# build lib As from asLib.c: -# -LIBRARY := As -As_SRCS := asLib.c - -# All systems link the libs As, Com, Db (and again Com ??), -# generic Unix needs also lib m: -# -SYS_PROD_LIBS_DEFAULT := m -SYS_PROD_LIBS_WIN32 := -nil- -PROD_LIBS := As Com Db Com - -PROD = ascheck - -include $(TOP)/configure/RULES_BUILD - -# Extra rule since asLib_lex.c is included in asLib.c -# In my opinion, these objects should really be built -# independently. -asLib$(OBJ): asLib_lex.c ../asLibRoutines.c - -clean:: - @$(RM) asLib.c asLib_lex.c - diff --git a/src/as/Makefile.Ioc b/src/as/Makefile.Ioc deleted file mode 100644 index 44e03eab7..000000000 --- a/src/as/Makefile.Ioc +++ /dev/null @@ -1,21 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -USR_CFLAGS += -DACCESS_SECURITY -D_NO_PROTO - -LIBRARY = asLibrary - -asLibrary_SRCS = asDbLib.c asCa.c asLib.c - -include $(TOP)/configure/RULES_BUILD - -# Extra rule since asLib_lex.c is included in asLib.c -# In my opinion, these objects should really be built -# independently. -asLib$(OBJ): asLib_lex.c ../asLibRoutines.c - -clean:: - @$(RM) asLib.c asLib_lex.c - diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile index 546c79eee..6fbffda51 100644 --- a/src/dev/softDev/Makefile +++ b/src/dev/softDev/Makefile @@ -2,5 +2,34 @@ TOP=../../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +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 += devPtSoft.c +SRCS += devSASoft.c +SRCS += devSiSoft.c +SRCS += devSoSoft.c +SRCS += devWfSoft.c + +OBJS_IOC = $(SRCS:%.c=%.o) + +include $(TOP)/configure/RULES + diff --git a/src/dev/softDev/Makefile.Ioc b/src/dev/softDev/Makefile.Ioc deleted file mode 100644 index b738b8df9..000000000 --- a/src/dev/softDev/Makefile.Ioc +++ /dev/null @@ -1,35 +0,0 @@ -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 += devPtSoft.c -SRCS += devSASoft.c -SRCS += devSiSoft.c -SRCS += devSoSoft.c -SRCS += devWfSoft.c - -PROD = $(SRCS:%.c=%.o) - -include $(TOP)/configure/RULES_BUILD - - diff --git a/src/dev/testDev/Makefile b/src/dev/testDev/Makefile index 546c79eee..1743e13a1 100644 --- a/src/dev/testDev/Makefile +++ b/src/dev/testDev/Makefile @@ -2,5 +2,18 @@ TOP=../../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +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 +OBJS_IOC = $(SRCS:%.c=%.o) + +include $(TOP)/configure/RULES diff --git a/src/dev/testDev/Makefile.Ioc b/src/dev/testDev/Makefile.Ioc deleted file mode 100644 index f832a5f2b..000000000 --- a/src/dev/testDev/Makefile.Ioc +++ /dev/null @@ -1,22 +0,0 @@ -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 - -PROD = $(SRCS:%.c=%.o) - - -include $(TOP)/configure/RULES_BUILD - - diff --git a/src/rec/Makefile b/src/rec/Makefile index f036231b2..179bfe11f 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -1,7 +1,99 @@ - TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +INC += egDefs.h +INC += erDefs.h +INC += ereventDefs.h + +#USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd +RECTYPES += aaiRecord.h +RECTYPES += aaoRecord.h +RECTYPES += aiRecord.h +RECTYPES += aoRecord.h +RECTYPES += biRecord.h +RECTYPES += boRecord.h +RECTYPES += calcRecord.h +RECTYPES += calcoutRecord.h +RECTYPES += compressRecord.h +RECTYPES += dfanoutRecord.h +RECTYPES += egRecord.h +RECTYPES += egeventRecord.h +RECTYPES += erRecord.h +RECTYPES += ereventRecord.h +RECTYPES += eventRecord.h +RECTYPES += fanoutRecord.h +RECTYPES += gsubRecord.h +RECTYPES += histogramRecord.h +RECTYPES += longinRecord.h +RECTYPES += longoutRecord.h +RECTYPES += mbbiRecord.h +RECTYPES += mbbiDirectRecord.h +RECTYPES += mbboRecord.h +RECTYPES += mbboDirectRecord.h +RECTYPES += palRecord.h +RECTYPES += permissiveRecord.h +RECTYPES += pidRecord.h +RECTYPES += pulseCounterRecord.h +RECTYPES += pulseDelayRecord.h +RECTYPES += pulseTrainRecord.h +RECTYPES += selRecord.h +RECTYPES += seqRecord.h +RECTYPES += stateRecord.h +RECTYPES += steppermotorRecord.h +RECTYPES += stringinRecord.h +RECTYPES += stringoutRecord.h +RECTYPES += subRecord.h +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 += palRecord.o +OBJS_IOC += permissiveRecord.o +OBJS_IOC += pidRecord.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 += steppermotorRecord.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 + +include $(TOP)/configure/RULES + +aaiRecord.o : aaiRecord.h + +%Record.o : %Record.h + + +$(OBJS_IOC) : $(RECTYPES) diff --git a/src/rec/Makefile.Host b/src/rec/Makefile.Host deleted file mode 100644 index 611ca68f1..000000000 --- a/src/rec/Makefile.Host +++ /dev/null @@ -1,54 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - - -INC += egDefs.h -INC += erDefs.h -INC += ereventDefs.h - -USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd -RECTYPES += aaiRecord.h -RECTYPES += aaoRecord.h -RECTYPES += aiRecord.h -RECTYPES += aoRecord.h -RECTYPES += biRecord.h -RECTYPES += boRecord.h -RECTYPES += calcRecord.h -RECTYPES += calcoutRecord.h -RECTYPES += compressRecord.h -RECTYPES += dfanoutRecord.h -RECTYPES += egRecord.h -RECTYPES += egeventRecord.h -RECTYPES += erRecord.h -RECTYPES += ereventRecord.h -RECTYPES += eventRecord.h -RECTYPES += fanoutRecord.h -RECTYPES += gsubRecord.h -RECTYPES += histogramRecord.h -RECTYPES += longinRecord.h -RECTYPES += longoutRecord.h -RECTYPES += mbbiRecord.h -RECTYPES += mbbiDirectRecord.h -RECTYPES += mbboRecord.h -RECTYPES += mbboDirectRecord.h -RECTYPES += palRecord.h -RECTYPES += permissiveRecord.h -RECTYPES += pidRecord.h -RECTYPES += pulseCounterRecord.h -RECTYPES += pulseDelayRecord.h -RECTYPES += pulseTrainRecord.h -RECTYPES += selRecord.h -RECTYPES += seqRecord.h -RECTYPES += stateRecord.h -RECTYPES += steppermotorRecord.h -RECTYPES += stringinRecord.h -RECTYPES += stringoutRecord.h -RECTYPES += subRecord.h -RECTYPES += subArrayRecord.h -RECTYPES += timerRecord.h -RECTYPES += waveformRecord.h - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/rec/Makefile.Ioc b/src/rec/Makefile.Ioc deleted file mode 100644 index 8185d0146..000000000 --- a/src/rec/Makefile.Ioc +++ /dev/null @@ -1,55 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - - -INC += egDefs.h -INC += erDefs.h -INC += ereventDefs.h - -USR_INCLUDES = -I../drv/ansi -I../../drv/old - -PROD += aaiRecord.o -PROD += aaoRecord.o -PROD += aiRecord.o -PROD += aoRecord.o -PROD += biRecord.o -PROD += boRecord.o -PROD += calcRecord.o -PROD += calcoutRecord.o -PROD += compressRecord.o -PROD += dfanoutRecord.o -PROD += egRecord.o -PROD += egeventRecord.o -PROD += erRecord.o -PROD += ereventRecord.o -PROD += eventRecord.o -PROD += fanoutRecord.o -PROD += gsubRecord.o -PROD += histogramRecord.o -PROD += longinRecord.o -PROD += longoutRecord.o -PROD += mbbiRecord.o -PROD += mbbiDirectRecord.o -PROD += mbboRecord.o -PROD += mbboDirectRecord.o -PROD += palRecord.o -PROD += permissiveRecord.o -PROD += pidRecord.o -PROD += pulseCounterRecord.o -PROD += pulseDelayRecord.o -PROD += pulseTrainRecord.o -PROD += selRecord.o -PROD += seqRecord.o -PROD += stateRecord.o -#PROD += steppermotorRecord.o -PROD += stringinRecord.o -PROD += stringoutRecord.o -PROD += subRecord.o -PROD += subArrayRecord.o -PROD += timerRecord.o -PROD += waveformRecord.o - -include $(TOP)/configure/RULES_BUILD -