diff --git a/src/db/Makefile b/src/db/Makefile index 1c2c26b1d..f036231b2 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -3,71 +3,5 @@ TOP=../.. include $(TOP)/configure/CONFIG -# includes to install from this sub-project -# -#INC += drvSup.h moved to include dir -INC += callback.h -INC += dbLock.h -INC += dbAccess.h -INC += dbConvert.h -INC += dbEvent.h -INC += dbScan.h -INC += db_access.h -INC += dbAddr.h -INC += db_field_log.h -INC += initHooks.h -INC += recSup.h -#INC += devSup.h moved to include dir -INC += taskwd.h -INC += recGbl.h -INC += dbBkpt.h +include $(TOP)/configure/RULES_ARCHS -MENUS += menuAlarmSevr.h -MENUS += menuAlarmStat.h -MENUS += menuArrType.h -MENUS += menuCompress.h -MENUS += menuFtype.h -MENUS += menuIvoa.h -MENUS += menuLinr.h -MENUS += menuOmsl.h -MENUS += menuPriority.h -MENUS += menuScan.h -MENUS += menuYesNo.h - -RECTYPES += dbCommon.h -USER_DBDFLAGS += -I .. - -DBDINSTALL += dbCommonRecord.dbd -DBDINSTALL += menuGlobal.dbd - -USR_CFLAGS += -ansi - -dbLib_SRCS = \ - dbLock.c\ - dbAccess.c\ - dbBkpt.c\ - dbConvert.c\ - dbFastLinkConv.c\ - dbNotify.c \ - iocInit.c\ - dbScan.c\ - dbEvent.c\ - dbTest.c\ - db_access.c\ - db_test.c\ - recGbl.c\ - callback.c\ - taskwd.c\ - dbCa.c \ - initHooks.c \ - dbcar.c - - -LIBRARY_vxWorks = dbLib - -include $(TOP)/configure/RULES_BUILD - -dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd - $(RM) $@ - $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \ - $(USER_DBDFLAGS) $< diff --git a/src/db/Makefile.Host b/src/db/Makefile.Host new file mode 100644 index 000000000..0e0349431 --- /dev/null +++ b/src/db/Makefile.Host @@ -0,0 +1,46 @@ + +TOP=../.. + +include $(TOP)/configure/CONFIG + +# includes to install from this sub-project +# +INC += callback.h +INC += dbLock.h +INC += dbAccess.h +INC += dbConvert.h +INC += dbEvent.h +INC += dbScan.h +INC += db_access.h +INC += dbAddr.h +INC += db_field_log.h +INC += initHooks.h +INC += recSup.h +INC += taskwd.h +INC += recGbl.h +INC += dbBkpt.h + +MENUS += menuAlarmSevr.h +MENUS += menuAlarmStat.h +MENUS += menuArrType.h +MENUS += menuCompress.h +MENUS += menuFtype.h +MENUS += menuIvoa.h +MENUS += menuLinr.h +MENUS += menuOmsl.h +MENUS += menuPriority.h +MENUS += menuScan.h +MENUS += menuYesNo.h + +RECTYPES += dbCommon.h +USER_DBDFLAGS += -I .. + +DBDINSTALL += dbCommonRecord.dbd +DBDINSTALL += menuGlobal.dbd + +include $(TOP)/configure/RULES_BUILD + +dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd + $(RM) $@ + $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \ + $(USER_DBDFLAGS) $< diff --git a/src/db/Makefile.Ioc b/src/db/Makefile.Ioc new file mode 100644 index 000000000..d3ed5768a --- /dev/null +++ b/src/db/Makefile.Ioc @@ -0,0 +1,35 @@ + +TOP=../.. + +include $(TOP)/configure/CONFIG + + +dbLib_SRCS = \ + dbLock.c\ + dbAccess.c\ + dbBkpt.c\ + dbConvert.c\ + dbFastLinkConv.c\ + dbNotify.c \ + iocInit.c\ + dbScan.c\ + dbEvent.c\ + dbTest.c\ + db_access.c\ + db_test.c\ + recGbl.c\ + callback.c\ + taskwd.c\ + dbCa.c \ + initHooks.c \ + dbcar.c + + +LIBRARY = dbLib + +include $(TOP)/configure/RULES_BUILD + +dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd + $(RM) $@ + $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \ + $(USER_DBDFLAGS) $< diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index 1e494f4a3..d56852bad 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -3,42 +3,4 @@ TOP=../.. include $(TOP)/configure/CONFIG -# includes to install from this sub-project -# -INC += alarm.h alarmString.h dbBase.h dbFldTypes.h -INC += dbStaticLib.h link.h special.h guigroup.h - -# Sources to compile & put into lib: -# -Db_SRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c - -# Library to build: -# -LIBRARY_DEFAULT := Db - -# Products to build: -# -PROD_DEFAULT := dbReadTest dbExpand dbToMenuH dbToRecordtypeH -PROD_vxWorks := -nil- - -# libs needed by PROD: -# -PROD_LIBS := Db Com - -dbStaticLib_SRCS = \ - dbYacc.c\ - dbPvdLib.c\ - dbStaticRun.c\ - dbStaticLib.c - -LIBRARY_vxWorks = dbStaticLib - -include $(TOP)/configure/RULES_BUILD - -# Extra rule since dbLexRoutines.c is included in dbYacc.c -dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c - -clean:: - @$(RM) dbLex.c dbYacc.c - -# EOF Makefile.Host for base/src/dbStatic +include $(TOP)/configure/RULES_ARCHS diff --git a/src/dbStatic/Makefile.Host b/src/dbStatic/Makefile.Host new file mode 100644 index 000000000..bfbe0801a --- /dev/null +++ b/src/dbStatic/Makefile.Host @@ -0,0 +1,36 @@ + +TOP=../.. + +include $(TOP)/configure/CONFIG + +# includes to install from this sub-project +# +INC += alarm.h alarmString.h dbBase.h dbFldTypes.h +INC += dbStaticLib.h link.h special.h guigroup.h + +# Sources to compile & put into lib: +# +Db_SRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c + +# Library to build: +# +LIBRARY := Db + +# Products to build: +# +PROD = dbReadTest dbExpand dbToMenuH dbToRecordtypeH + +# libs needed by PROD: +# +PROD_LIBS := Db Com +Db_DIR=. + +include $(TOP)/configure/RULES_BUILD + +# Extra rule since dbLexRoutines.c is included in dbYacc.c +dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c + +clean:: + @$(RM) dbLex.c dbYacc.c + +# EOF Makefile.Host for base/src/dbStatic diff --git a/src/dbStatic/Makefile.Ioc b/src/dbStatic/Makefile.Ioc new file mode 100644 index 000000000..892b94d84 --- /dev/null +++ b/src/dbStatic/Makefile.Ioc @@ -0,0 +1,22 @@ + +TOP=../.. + +include $(TOP)/configure/CONFIG + +dbStaticLib_SRCS = \ + dbYacc.c\ + dbPvdLib.c\ + dbStaticRun.c\ + dbStaticLib.c + +LIBRARY = dbStaticLib + +include $(TOP)/configure/RULES_BUILD + +# Extra rule since dbLexRoutines.c is included in dbYacc.c +dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c + +clean:: + @$(RM) dbLex.c dbYacc.c + +# EOF Makefile.Host for base/src/dbStatic diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile index fd14c6312..d56852bad 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -3,22 +3,4 @@ TOP=../.. include $(TOP)/configure/CONFIG -YACCOPT := -l -LEXOPT := -L - -#dbSubs_SRCS = dbLoadTemplate_lex.c -dbSubs_SRCS += dbLoadTemplate.c - -LIBRARY_vxWorks = dbSubs - -include $(TOP)/configure/RULES_BUILD - -# -# These lex sources are included in some C sources, -# so they have to be created in time: -# -dbLoadTemplate$(OBJ): dbLoadTemplate_lex.c - -clean:: - @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c - +include $(TOP)/configure/RULES_ARCHS diff --git a/src/dbtools/Makefile.Ioc b/src/dbtools/Makefile.Ioc new file mode 100644 index 000000000..9f689f1df --- /dev/null +++ b/src/dbtools/Makefile.Ioc @@ -0,0 +1,23 @@ + +TOP=../.. + +include $(TOP)/configure/CONFIG + +YACCOPT := -l +LEXOPT := -L + +dbSubs_SRCS += dbLoadTemplate.c + +LIBRARY = dbSubs + +include $(TOP)/configure/RULES_BUILD + +# +# These lex sources are included in some C sources, +# so they have to be created in time: +# +dbLoadTemplate$(OBJ): dbLoadTemplate_lex.c + +clean:: + @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c + diff --git a/src/dev/softDev/Makefile b/src/dev/softDev/Makefile index 25cd790f2..546c79eee 100644 --- a/src/dev/softDev/Makefile +++ b/src/dev/softDev/Makefile @@ -2,34 +2,5 @@ TOP=../../.. include $(TOP)/configure/CONFIG -MYMYSRCSS += devAiSoft.c -MYMYSRCSS += devAiSoftRaw.c -MYMYSRCSS += devAoSoft.c -MYMYSRCSS += devAoSoftRaw.c -MYMYSRCSS += devBiSoft.c -MYMYSRCSS += devBiSoftRaw.c -MYMYSRCSS += devBoSoft.c -MYMYSRCSS += devBoSoftRaw.c -MYMYSRCSS += devEventSoft.c -MYMYSRCSS += devHistogramSoft.c -MYMYSRCSS += devLiSoft.c -MYMYSRCSS += devLoSoft.c -MYMYSRCSS += devMbbiDirectSoft.c -MYMYSRCSS += devMbbiDirectSoftRaw.c -MYMYSRCSS += devMbbiSoft.c -MYMYSRCSS += devMbbiSoftRaw.c -MYMYSRCSS += devMbboDirectSoft.c -MYMYSRCSS += devMbboDirectSoftRaw.c -MYMYSRCSS += devMbboSoft.c -MYMYSRCSS += devMbboSoftRaw.c -MYMYSRCSS += devPtSoft.c -MYMYSRCSS += devSASoft.c -MYMYSRCSS += devSiSoft.c -MYMYSRCSS += devSoSoft.c -MYMYSRCSS += devWfSoft.c - -PROD_vxWorks = $(MYMYSRCSS:%.c=%.o) - -include $(TOP)/configure/RULES_BUILD - +include $(TOP)/configure/RULES_ARCHS diff --git a/src/dev/softDev/Makefile.Ioc b/src/dev/softDev/Makefile.Ioc new file mode 100644 index 000000000..b738b8df9 --- /dev/null +++ b/src/dev/softDev/Makefile.Ioc @@ -0,0 +1,35 @@ +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 7f35a17e8..546c79eee 100644 --- a/src/dev/testDev/Makefile +++ b/src/dev/testDev/Makefile @@ -2,20 +2,5 @@ TOP=../../.. include $(TOP)/configure/CONFIG -MYSRCS += devAiTestAsyn.c -MYSRCS += devAoTestAsyn.c -MYSRCS += devBiTestAsyn.c -MYSRCS += devBoTestAsyn.c -MYSRCS += devEventTestIoEvent.c -MYSRCS += devHistogramTestAsyn.c -MYSRCS += devMbbiTestAsyn.c -MYSRCS += devMbboTestAsyn.c -MYSRCS += devSiTestAsyn.c -MYSRCS += devSoTestAsyn.c -MYSRCS += devWfTestAsyn.c - -PROD_vxWorks = $(MYSRCS:%.c=%.o) - -include $(TOP)/configure/RULES_BUILD - +include $(TOP)/configure/RULES_ARCHS diff --git a/src/dev/testDev/Makefile.Ioc b/src/dev/testDev/Makefile.Ioc new file mode 100644 index 000000000..f832a5f2b --- /dev/null +++ b/src/dev/testDev/Makefile.Ioc @@ -0,0 +1,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 + +PROD = $(SRCS:%.c=%.o) + + +include $(TOP)/configure/RULES_BUILD + + diff --git a/src/gdd/Makefile b/src/gdd/Makefile index 18f6f7655..d56852bad 100644 --- a/src/gdd/Makefile +++ b/src/gdd/Makefile @@ -1,83 +1,6 @@ TOP=../.. + include $(TOP)/configure/CONFIG -INC += gdd.h -INC += gddI.h -INC += gddContainer.h -INC += gddContainerI.h -INC += gddArray.h -INC += gddArrayI.h -INC += gddScalar.h -INC += gddScalarI.h -INC += gddSemaphore.h -INC += gddNewDel.h -INC += gddUtils.h -INC += gddUtilsI.h -INC += gddErrorCodes.h -INC += aitTypes.h -INC += aitConvert.h -INC += aitHelpers.h -INC += dbMapper.h -INC += gddAppTable.h -INC += gddAppFuncTable.h -INC += gddApps.h -INC += smartGDDPointer.h - -AITGENSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \ - gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc \ - gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc - -LIBSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \ - gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc dbMapper.cc \ - gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc \ - smartGDDPointer.cc - -LIBRARY_DEFAULT = gdd - -include $(TOP)/configure/RULES_BUILD - -# cannot generate these dependencies automatically -# -# Problem: Some dependencies are include files that may -# not have been installed if we are building for -# the first time -# -> use explicit reference to the uninstalled files in '..' -aitConvert$(OBJ): ../aitConvert.cc aitConvertGenerated.cc\ - ../aitConvert.h ../aitTypes.h - - -dbMapper.o: ../gdd.h ../gddI.h ../gddContainer.h ../gddContainerI.h \ - ../gddArray.h ../gddScalar.h ../gddAppTable.h ../dbMapper.h \ - gddApps.h ../aitTypes.h ../gddUtils.h ../gddUtilsI.h - -# Rules for generated files -# -aitConvertGenerated.cc: ../O.$(HOST_ARCH)/aitGen$(HOSTEXE) ../aitTypes.h - ../O.$(HOST_ARCH)/aitGen$(HOSTEXE) - -gddApps.h : ../O.$(HOST_ARCH)/genApps$(HOSTEXE) - ../O.$(HOST_ARCH)/genApps$(HOSTEXE) $@ - -# unfortunately there is only one TESTPROD/TESTPROD_SRCS allowed -# right now -# (or many 'simple' progs: -# TESTPROD:=a b c -# where a is build from a.cc, b from b.cc, c from c.cc -# ) -# -# This rule, however, should be system-independent: -ifeq ($(HOST_ARCH),$(T_A)) - -../O.$(HOST_ARCH)/aitGen$(HOSTEXE): aitGen$(OBJ) aitTypes$(OBJ) - $(LINK.c) $^ - -../O.$(HOST_ARCH)/genApps$(HOSTEXE): genApps$(OBJ) $(addsuffix $(OBJ), $(basename $(AITGENSRCS))) - $(LINK.cc) $^ - -endif - -clean:: - $(RM) aitConvertGenerated.cc aitGen$(HOSTEXE) genApps$(HOSTEXE) - -# EOF base/src/gdd/Makefile +include $(TOP)/configure/RULES_ARCHS diff --git a/src/gdd/Makefile.Host b/src/gdd/Makefile.Host new file mode 100644 index 000000000..2ab3bd7ca --- /dev/null +++ b/src/gdd/Makefile.Host @@ -0,0 +1,83 @@ + +TOP=../.. +include $(TOP)/configure/CONFIG + +INC += gdd.h +INC += gddI.h +INC += gddContainer.h +INC += gddContainerI.h +INC += gddArray.h +INC += gddArrayI.h +INC += gddScalar.h +INC += gddScalarI.h +INC += gddSemaphore.h +INC += gddNewDel.h +INC += gddUtils.h +INC += gddUtilsI.h +INC += gddErrorCodes.h +INC += aitTypes.h +INC += aitConvert.h +INC += aitHelpers.h +INC += dbMapper.h +INC += gddAppTable.h +INC += gddAppFuncTable.h +INC += gddApps.h +INC += smartGDDPointer.h + +AITGENSRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \ + gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc \ + gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc + +gdd_SRCS := gdd.cc gddTest.cc gddAppTable.cc gddNewDel.cc \ + gddAppDefs.cc aitTypes.c aitConvert.cc aitHelpers.cc dbMapper.cc \ + gddArray.cc gddContainer.cc gddErrorCodes.cc gddUtils.cc \ + smartGDDPointer.cc + +LIBRARY = gdd + +genApps_SRCS = genApps.cc $(AITGENSRCS) +aitGen_SRCS = aitTypes.c aitGen.c +#TESTPROD = aitGen genApps + +include $(TOP)/configure/RULES_BUILD + +# cannot generate these dependencies automatically +# +# Problem: Some dependencies are include files that may +# not have been installed if we are building for +# the first time +# -> use explicit reference to the uninstalled files in '..' +aitConvert$(OBJ): ../aitConvert.cc aitConvertGenerated.cc\ + ../aitConvert.h ../aitTypes.h + + +dbMapper.o: ../gdd.h ../gddI.h ../gddContainer.h ../gddContainerI.h \ + ../gddArray.h ../gddScalar.h ../gddAppTable.h ../dbMapper.h \ + $(INSTALL_INCLUDE)/gddApps.h ../aitTypes.h ../gddUtils.h ../gddUtilsI.h + +# Rules for generated files +# +aitConvertGenerated.cc: aitGen$(HOSTEXE) ../aitTypes.h + ./aitGen$(HOSTEXE) + +gddApps.h : genApps$(HOSTEXE) + ./genApps$(HOSTEXE) $@ + +# unfortunately there is only one TESTPROD/TESTPROD_SRCS allowed +# right now +# (or many 'simple' progs: +# TESTPROD:=a b c +# where a is build from a.cc, b from b.cc, c from c.cc +# ) +# +# This rule, however, should be system-independent: +aitGen$(HOSTEXE): aitGen$(OBJ) aitTypes$(OBJ) + $(LINK.c) $^ + +genApps$(HOSTEXE): genApps$(OBJ) $(addsuffix $(OBJ), $(basename $(AITGENSRCS))) + $(LINK.cc) $^ + +clean:: + $(RM) aitConvertGenerated.cc aitGen$(HOSTEXE) genApps$(HOSTEXE) + +# EOF base/src/gdd/Makefile.Host:n