From 8fda4a2d620297402d656b2e08809d6820d1811e Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 25 Jan 2000 23:12:32 +0000 Subject: [PATCH] Converted to single Makefile build method. --- src/cas/build/Makefile | 65 ++++++++++++++- src/cas/example/directoryService/Makefile | 30 ++++++- .../example/directoryService/Makefile.Host | 33 -------- src/cas/example/simple/Makefile | 26 +++++- src/cas/example/simple/Makefile.Host | 31 ------- src/cas/generic/Makefile | 4 +- src/cas/generic/Makefile.Host | 9 -- src/gdd/Makefile | 81 +++++++++++++++++- src/gdd/Makefile.Host | 83 ------------------- 9 files changed, 199 insertions(+), 163 deletions(-) delete mode 100644 src/cas/example/directoryService/Makefile.Host delete mode 100644 src/cas/example/simple/Makefile.Host delete mode 100644 src/cas/generic/Makefile.Host delete mode 100644 src/gdd/Makefile.Host diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile index 8984d6975..8b5681a5f 100644 --- a/src/cas/build/Makefile +++ b/src/cas/build/Makefile @@ -1,8 +1,67 @@ - -TOP=../../.. +TOP := ../../.. +CAS := $(TOP)/src/cas +SRC := $(CAS)/generic +CA := $(CAS)/../ca +IOSRC := $(CAS)/io/bsdSocket +STSRC := $(SRC)/st +USER_VPATH := $(SRC) $(STSRC) $(IOSRC) include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +CXXCMPLR = STRICT +# sometimes it's good to have different C/C++ flags, not now: +USR_CFLAGS = -I$(SRC) -I$(IOSRC) -I$(STSRC) -I$(CA) -DcaNetAddrSock +USR_CXXFLAGS = $(USR_CFLAGS) + +LIBSRCS += caServer.cc +LIBSRCS += caServerI.cc +LIBSRCS += casCoreClient.cc +LIBSRCS += casClient.cc +LIBSRCS += casDGClient.cc +LIBSRCS += casStrmClient.cc +LIBSRCS += casPV.cc +LIBSRCS += casPVI.cc +LIBSRCS += casChannel.cc +LIBSRCS += casChannelI.cc +LIBSRCS += casPVListChan.cc +LIBSRCS += casClientMon.cc +LIBSRCS += casChanDelEv.cc +LIBSRCS += casAsyncIOI.cc +LIBSRCS += casAsyncReadIO.cc +LIBSRCS += casAsyncWriteIO.cc +LIBSRCS += casAsyncPVExistIO.cc +LIBSRCS += casAsyncPVAttachIO.cc +LIBSRCS += casEventSys.cc +LIBSRCS += casMonitor.cc +LIBSRCS += casMonEvent.cc +LIBSRCS += inBuf.cc +LIBSRCS += outBuf.cc +LIBSRCS += dgInBuf.cc +LIBSRCS += casCtx.cc +LIBSRCS += casEventMask.cc +LIBSRCS += ioBlocked.cc +#LIBSRCS += casMsgIO.cc + +LIBSRCS += caServerOS.cc +LIBSRCS += casIntfOS.cc +LIBSRCS += casDGIntfOS.cc +LIBSRCS += casDGOS.cc +LIBSRCS += casStreamOS.cc + +LIBSRCS += caServerIO.cc +LIBSRCS += casIntfIO.cc +LIBSRCS += casDGIntfIO.cc +LIBSRCS += casDGIO.cc +LIBSRCS += casStreamIO.cc + +LIBRARY = cas + +PROD_LIBS := cas ca gdd Com +SYS_PROD_LIBS_WIN32 := ws2_32 + +include $(TOP)/configure/RULES + +clean:: + @$(RM) -rf Templates.DB diff --git a/src/cas/example/directoryService/Makefile b/src/cas/example/directoryService/Makefile index 5f7b243f6..9ae192119 100644 --- a/src/cas/example/directoryService/Makefile +++ b/src/cas/example/directoryService/Makefile @@ -3,4 +3,32 @@ TOP=../../../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +CXXCMPLR = STRICT + +PROD_LIBS := cas ca gdd Com +cas_DIR = $(INSTALL_LIB) +ca_DIR = $(INSTALL_LIB) +gdd_DIR = $(INSTALL_LIB) +Com_DIR = $(INSTALL_LIB) + +# +# Added winmm user32 for the non-dll build +# +SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 + +SRCS += main.cc +SRCS += directoryServer.cc + +PROD = caDirServ + +include $(TOP)/configure/RULES + +pcaDirServ: $(PROD_OBJS) $(PRODDEPLIBS) + $(PURIFY) $(PROD_LINKER) $(PROD_OBJS) $(LDLIBS) + +clean:: + @$(RM) caDirServ + @$(RM) pcaDirServ + @$(RM) -rf Templates.DB + @$(RM) core + diff --git a/src/cas/example/directoryService/Makefile.Host b/src/cas/example/directoryService/Makefile.Host deleted file mode 100644 index 5ea559292..000000000 --- a/src/cas/example/directoryService/Makefile.Host +++ /dev/null @@ -1,33 +0,0 @@ - -TOP=../../../.. -include $(TOP)/configure/CONFIG - -CXXCMPLR = STRICT - -PROD_LIBS := cas ca gdd Com -cas_DIR = $(INSTALL_LIB) -ca_DIR = $(INSTALL_LIB) -gdd_DIR = $(INSTALL_LIB) -Com_DIR = $(INSTALL_LIB) - -# -# Added winmm user32 for the non-dll build -# -SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 - -SRCS += main.cc -SRCS += directoryServer.cc - -PROD = caDirServ - -include $(TOP)/configure/RULES_BUILD - -pcaDirServ: $(PROD_OBJS) $(PRODDEPLIBS) - $(PURIFY) $(PROD_LINKER) $(PROD_OBJS) $(LDLIBS) - -clean:: - @$(RM) caDirServ - @$(RM) pcaDirServ - @$(RM) -rf Templates.DB - @$(RM) core - diff --git a/src/cas/example/simple/Makefile b/src/cas/example/simple/Makefile index f4ac443d0..21b7817f7 100644 --- a/src/cas/example/simple/Makefile +++ b/src/cas/example/simple/Makefile @@ -3,5 +3,29 @@ TOP=../../../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +CXXCMPLR = STRICT + +PROD_LIBS := cas ca gdd Com +cas_DIR = $(INSTALL_LIB) +ca_DIR = $(INSTALL_LIB) +gdd_DIR = $(INSTALL_LIB) +Com_DIR = $(INSTALL_LIB) + +# +# Added ws2_32 winmm user32 for the non-dll build +# +SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 + +SRCS += main.cc +SRCS += exServer.cc +SRCS += exPV.cc +SRCS += exVectorPV.cc +SRCS += exScalarPV.cc +SRCS += exAsyncPV.cc +SRCS += exChannel.cc + +PROD = excas + +include $(TOP)/configure/RULES + diff --git a/src/cas/example/simple/Makefile.Host b/src/cas/example/simple/Makefile.Host deleted file mode 100644 index d0e146cde..000000000 --- a/src/cas/example/simple/Makefile.Host +++ /dev/null @@ -1,31 +0,0 @@ - -TOP=../../../.. - -include $(TOP)/configure/CONFIG - -CXXCMPLR = STRICT - -PROD_LIBS := cas ca gdd Com -cas_DIR = $(INSTALL_LIB) -ca_DIR = $(INSTALL_LIB) -gdd_DIR = $(INSTALL_LIB) -Com_DIR = $(INSTALL_LIB) - -# -# Added ws2_32 winmm user32 for the non-dll build -# -SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 - -SRCS += main.cc -SRCS += exServer.cc -SRCS += exPV.cc -SRCS += exVectorPV.cc -SRCS += exScalarPV.cc -SRCS += exAsyncPV.cc -SRCS += exChannel.cc - -PROD = excas - -include $(TOP)/configure/RULES_BUILD - - diff --git a/src/cas/generic/Makefile b/src/cas/generic/Makefile index 56431ab04..866bc29e9 100644 --- a/src/cas/generic/Makefile +++ b/src/cas/generic/Makefile @@ -3,5 +3,7 @@ TOP = ../../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +INC := casdef.h casInternal.h casEventMask.h caNetAddr.h + +include $(TOP)/configure/RULES diff --git a/src/cas/generic/Makefile.Host b/src/cas/generic/Makefile.Host deleted file mode 100644 index a45c55c28..000000000 --- a/src/cas/generic/Makefile.Host +++ /dev/null @@ -1,9 +0,0 @@ - -TOP = ../../.. - -include $(TOP)/configure/CONFIG - -INC := casdef.h casInternal.h casEventMask.h caNetAddr.h - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/gdd/Makefile b/src/gdd/Makefile index d56852bad..fa4f4f039 100644 --- a/src/gdd/Makefile +++ b/src/gdd/Makefile @@ -3,4 +3,83 @@ TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +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 += smartGDDPointer.h +INC += gddApps.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 + +# 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$(EXE) + ./genApps$(EXE) $@ + +# 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$(EXE): aitGen$(OBJ) aitTypes$(OBJ) + $(LINK.c) $^ + +genApps$(EXE): genApps$(OBJ) $(addsuffix $(OBJ), $(basename $(AITGENSRCS))) + $(LINK.cpp) $^ + +clean:: + $(RM) aitConvertGenerated.cc aitGen$(HOSTEXE) genApps$(EXE) + +# EOF base/src/gdd/Makefile.Host:n + diff --git a/src/gdd/Makefile.Host b/src/gdd/Makefile.Host deleted file mode 100644 index 2ab3bd7ca..000000000 --- a/src/gdd/Makefile.Host +++ /dev/null @@ -1,83 +0,0 @@ - -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