diff --git a/src/cas/Makefile b/src/cas/Makefile index 1933ab824..9cbb0e0ec 100644 --- a/src/cas/Makefile +++ b/src/cas/Makefile @@ -1,10 +1,10 @@ TOP=../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG DIRS = generic build example -include $(TOP)/config/RULES_DIRS +include $(TOP)/configure/RULES_DIRS diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile index adf449d0f..a339492fc 100644 --- a/src/cas/build/Makefile +++ b/src/cas/build/Makefile @@ -1,10 +1,10 @@ TOP=../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG DIRS = singleThread -include $(TOP)/config/RULES_DIRS +include $(TOP)/configure/RULES_DIRS diff --git a/src/cas/build/multiThread/Makefile b/src/cas/build/multiThread/Makefile index db8703667..1f1ed9703 100644 --- a/src/cas/build/multiThread/Makefile +++ b/src/cas/build/multiThread/Makefile @@ -1,8 +1,8 @@ TOP=../../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +include $(TOP)/configure/RULES_BUILD diff --git a/src/cas/build/multiThread/Makefile.Vx b/src/cas/build/multiThread/Makefile.Vx deleted file mode 100644 index b376bbe76..000000000 --- a/src/cas/build/multiThread/Makefile.Vx +++ /dev/null @@ -1,95 +0,0 @@ - -#HERE := $(shell pwd) -HERE = . -CAS = $(HERE)/../../.. -TOP = $(CAS)/../.. -SRC = $(CAS)/generic -CA = $(CAS)/../ca -IOSRC = $(CAS)/io/bsdSocket -OSSRC = $(CAS)/os/vxWorks -VPATH = $(SRC) $(SRC)/mt $(IOSRC) $(OSSRC) - -include $(TOP)/config/CONFIG_BASE - -CXXCMPLR = STRICT - -USR_INCLUDES = -I$(SRC) -I$(OSSRC) -I$(IOSRC) -I$(CA)\ - -I$(TOP)/src/include/os/vxWorks - -DEPLIBS_BASE = $(EPICS_BASE_LIB) - -SRCS.cc += caServer.cc -SRCS.cc += caServerI.cc -SRCS.cc += casCoreClient.cc -SRCS.cc += casClient.cc -SRCS.cc += casDGClient.cc -SRCS.cc += casStrmClient.cc -SRCS.cc += casPV.cc -SRCS.cc += casPVI.cc -SRCS.cc += casChannel.cc -SRCS.cc += casChannelI.cc -SRCS.cc += casClientMon.cc -SRCS.cc += casChanDelEv.cc -SRCS.cc += casMsgIO.cc -SRCS.cc += casAsyncIO.cc -SRCS.cc += casAsyncIOI.cc -SRCS.cc += casEventSys.cc -SRCS.cc += casMonitor.cc -SRCS.cc += casMonEvent.cc -SRCS.cc += outBuf.cc -SRCS.cc += inBuf.cc -SRCS.cc += casEventMask.cc -SRCS.cc += ioBlocked.cc - -SRCS.cc += caServerOS.cc -SRCS.cc += casDGOS.cc -SRCS.cc += casStreamOS.cc - -SRCS.cc += caServerIO.cc -SRCS.cc += casDGIO.cc -SRCS.cc += casStreamIO.cc -SRCS.c += sigPipeIgnore.c - -LIBOBJS += caServer.o -LIBOBJS += caServerI.o -LIBOBJS += casCoreClient.o -LIBOBJS += casClient.o -LIBOBJS += casDGClient.o -LIBOBJS += casStrmClient.o -LIBOBJS += casPV.o -LIBOBJS += casPVI.o -LIBOBJS += casChannel.o -LIBOBJS += casChannelI.o -LIBOBJS += casClientMon.o -LIBOBJS += casChanDelEv.o -LIBOBJS += casMsgIO.o -LIBOBJS += casAsyncIO.o -LIBOBJS += casAsyncIOI.o -LIBOBJS += casEventSys.o -LIBOBJS += casMonitor.o -LIBOBJS += casMonEvent.o -LIBOBJS += outBuf.o -LIBOBJS += inBuf.o -LIBOBJS += casEventMask.o -LIBOBJS += ioBlocked.o - -LIBOBJS += caServerOS.o -LIBOBJS += casDGOS.o -LIBOBJS += casStreamOS.o - -LIBOBJS += caServerIO.o -LIBOBJS += casDGIO.o -LIBOBJS += casStreamIO.o -LIBOBJS += sigPipeIgnore.o - -LIBNAME = libcas.o - -include $(TOP)/config/RULES.Vx - -obj: $(LIBOBJS) - -test.o: - -clean:: - @$(RM) -rf Templates.DB - diff --git a/src/cas/example/Makefile b/src/cas/example/Makefile index 484b2e4b0..fb8b73ff1 100644 --- a/src/cas/example/Makefile +++ b/src/cas/example/Makefile @@ -1,10 +1,10 @@ TOP=../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG DIRS = simple directoryService -include $(TOP)/config/RULES_DIRS +include $(TOP)/configure/RULES_DIRS diff --git a/src/cas/example/directoryService/Makefile b/src/cas/example/directoryService/Makefile index d2a6e1302..2655d2924 100644 --- a/src/cas/example/directoryService/Makefile +++ b/src/cas/example/directoryService/Makefile @@ -1,7 +1,33 @@ TOP=../../../.. +include $(TOP)/configure/CONFIG -include $(TOP)/config/CONFIG_BASE +CXXCMPLR = STRICT -include $(TOP)/config/RULES_ARCHS +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/directoryService/Makefile.Host b/src/cas/example/directoryService/Makefile.Host deleted file mode 100644 index b8db6a0f7..000000000 --- a/src/cas/example/directoryService/Makefile.Host +++ /dev/null @@ -1,30 +0,0 @@ - -CAS = ../../.. -TOP = $(CAS)/../.. - -include $(TOP)/config/CONFIG_BASE - -CXXCMPLR = STRICT - -PROD_LIBS := cas ca gdd Com -# -# 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)/config/RULES.Host - -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/iocmonitor/Makefile b/src/cas/example/iocmonitor/Makefile index 88fea88a6..094c62d20 100644 --- a/src/cas/example/iocmonitor/Makefile +++ b/src/cas/example/iocmonitor/Makefile @@ -1,9 +1,12 @@ # $Log$ +# Revision 1.2 1997/05/13 14:22:58 jbk +# added comments at top +# TOP=../../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +include $(TOP)/configure/RULES_BUILD diff --git a/src/cas/example/iocmonitor/Makefile.Host b/src/cas/example/iocmonitor/Makefile.Host deleted file mode 100644 index 1f0cffb0f..000000000 --- a/src/cas/example/iocmonitor/Makefile.Host +++ /dev/null @@ -1,23 +0,0 @@ - -# $Log$ - -CAS = ../../.. -TOP = $(CAS)/../.. - -include $(TOP)/config/CONFIG_BASE - -CXXCMPLR = STRICT - -PROD_LIBS := cas ca gdd Com - -SRCS += mon.cc monAdl.cc monNode.cc monServer.cc - -PROD := iocMonitor - -include $(TOP)/config/RULES.Host - -clean:: - @$(RM) iocMonitor - @$(RM) -rf Templates.DB - @$(RM) core - diff --git a/src/cas/example/simple/Makefile b/src/cas/example/simple/Makefile index d2a6e1302..132c1bea2 100644 --- a/src/cas/example/simple/Makefile +++ b/src/cas/example/simple/Makefile @@ -1,7 +1,35 @@ TOP=../../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/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_BUILD + +clean:: + @$(RM) excas + @$(RM) -rf Templates.DB + @$(RM) core diff --git a/src/cas/example/simple/Makefile.Host b/src/cas/example/simple/Makefile.Host deleted file mode 100644 index bf28521ed..000000000 --- a/src/cas/example/simple/Makefile.Host +++ /dev/null @@ -1,31 +0,0 @@ - -CAS = ../../.. -TOP = $(CAS)/../.. - -include $(TOP)/config/CONFIG_BASE - -CXXCMPLR = STRICT - -PROD_LIBS := cas ca gdd Com -# -# 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)/config/RULES.Host - -clean:: - @$(RM) excas - @$(RM) -rf Templates.DB - @$(RM) core - diff --git a/src/cas/example/testdb/Makefile b/src/cas/example/testdb/Makefile index 88fea88a6..49ab9b6c6 100644 --- a/src/cas/example/testdb/Makefile +++ b/src/cas/example/testdb/Makefile @@ -1,9 +1,12 @@ # $Log$ +# Revision 1.2 1997/03/05 21:16:21 jbk +# Fixes cvs log id at top +# TOP=../../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +include $(TOP)/configure/RULES_BUILD diff --git a/src/cas/example/testdb/Makefile.Host b/src/cas/example/testdb/Makefile.Host deleted file mode 100644 index ab52b7bae..000000000 --- a/src/cas/example/testdb/Makefile.Host +++ /dev/null @@ -1,23 +0,0 @@ - -# $Log$ - -CAS = ../../.. -TOP = $(CAS)/../.. - -include $(TOP)/config/CONFIG_BASE - -CXXCMPLR = STRICT - -PROD_LIBS := cas ca gdd Com - -SRCS += pvServ.cc - -PROD :=pvServ - -include $(TOP)/config/RULES.Host - -clean:: - @$(RM) pvServ - @$(RM) -rf Templates.DB - @$(RM) core - diff --git a/src/cas/generic/Makefile b/src/cas/generic/Makefile index ccc111fa5..a45c55c28 100644 --- a/src/cas/generic/Makefile +++ b/src/cas/generic/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. -include $(TOP)/config/CONFIG_BASE +include $(TOP)/configure/CONFIG -include $(TOP)/config/RULES_ARCHS +INC := casdef.h casInternal.h casEventMask.h caNetAddr.h +include $(TOP)/configure/RULES_BUILD diff --git a/src/cas/generic/Makefile.Host b/src/cas/generic/Makefile.Host deleted file mode 100644 index 5932cab58..000000000 --- a/src/cas/generic/Makefile.Host +++ /dev/null @@ -1,8 +0,0 @@ - -TOP = ../../../.. -include $(TOP)/config/CONFIG_BASE - -INC := casdef.h casInternal.h casEventMask.h caNetAddr.h - -include $(TOP)/config/RULES.Host -