have both, makebaseapp Makefile and PSI makefile

2010-09-02 14:19:11 +00:00
parent 18ba904d6c
commit 5494aae1ba
2 changed files with 89 additions and 68 deletions
--- a/85
+++ b/85
@ -1,72 +1,21 @@
-include /ioc/tools/driver.makefile
-EXCLUDE_VERSIONS = 3.13.2
-PROJECT=stream2
-BUILDCLASSES += Linux
+TOP = ..

-#DOCUDIR = doc
+DIRS = src

-DBDS = stream.dbd
-
-BUSSES  += AsynDriver
-FORMATS += Enum
-FORMATS += BCD
-FORMATS += Raw
-FORMATS += RawFloat
-FORMATS += Binary
-FORMATS += Checksum
-FORMATS += Regexp
-FORMATS += MantissaExponent
-FORMATS += Timestamp
-
-RECORDTYPES += aai aao
-RECORDTYPES += ao ai
-RECORDTYPES += bo bi
-RECORDTYPES += mbbo mbbi
-RECORDTYPES += mbboDirect mbbiDirect
-RECORDTYPES += longout longin
-RECORDTYPES += stringout stringin
-RECORDTYPES += waveform
-
-SOURCES += $(RECORDTYPES:%=src/dev%Stream.c)
-SOURCES += $(FORMATS:%=src/%Converter.cc)
-SOURCES += $(BUSSES:%=src/%Interface.cc)
-SOURCES += $(wildcard src/Stream*.cc)
-SOURCES += src/StreamVersion.c
-SOURCES_3.14 += src/devcalcoutStream.c
-
-HEADERS += StreamFormat.h
-HEADERS += StreamFormatConverter.h
-HEADERS += StreamBuffer.h
-HEADERS += StreamError.h
-
-ifeq (${EPICS_BASETYPE},3.13)
-USR_INCLUDES += -include $(INSTALL_INCLUDE)/compat3_13.h
-endif
-
-StreamCore.o: streamReferences
-
-streamReferences:
-	@for i in $(BUSSES); \
-	do echo "extern void* ref_$${i}Interface;"; \
-           echo "void* p$$i = ref_$${i}Interface;"; \
-	done > $@
-	@for i in $(FORMATS); \
-	do echo "extern void* ref_$${i}Converter;"; \
-           echo "void* p$$i = ref_$${i}Converter;"; \
-	done >> $@
-
-ifeq (${EPICS_BASETYPE},3.13)
-stream.dbd:
-	@for r in $(RECORDTYPES); \
-	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
-	done > $@
-	@echo "driver(stream)" >> $@
+# Look if we have EPICS R3.13 or R3.14
+ifeq ($(wildcard $(TOP)/configure),)
+  # EPICS R3.13
+  include $(TOP)/config/CONFIG_APP
+  CONFIG = $(TOP)/config
 else
-stream.dbd:
-	@for r in $(RECORDTYPES) calcout; \
-	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
-	done > $@
-	@echo "driver(stream)" >> $@
-	@echo "variable(streamDebug, int)" >> $@
-	@echo "registrar(streamRegistrar)" >> $@
+  # EPICS R3.14
+  include $(TOP)/configure/CONFIG
+  ifneq ($(words $(CALC) $(SYNAPPS)), 0)
+    # with synApps calc module (contains scalcout)
+    DIRS += srcSynApps
+  endif
 endif
+
+DIRS += streamApp
+
+include $(CONFIG)/RULES_DIRS
--- a/72
+++ b/72
@ -0,0 +1,72 @@
+include /ioc/tools/driver.makefile
+EXCLUDE_VERSIONS = 3.13.2
+PROJECT=stream2
+BUILDCLASSES += Linux
+
+#DOCUDIR = doc
+
+DBDS = stream.dbd
+
+BUSSES  += AsynDriver
+FORMATS += Enum
+FORMATS += BCD
+FORMATS += Raw
+FORMATS += RawFloat
+FORMATS += Binary
+FORMATS += Checksum
+FORMATS += Regexp
+FORMATS += MantissaExponent
+FORMATS += Timestamp
+
+RECORDTYPES += aai aao
+RECORDTYPES += ao ai
+RECORDTYPES += bo bi
+RECORDTYPES += mbbo mbbi
+RECORDTYPES += mbboDirect mbbiDirect
+RECORDTYPES += longout longin
+RECORDTYPES += stringout stringin
+RECORDTYPES += waveform
+
+SOURCES += $(RECORDTYPES:%=src/dev%Stream.c)
+SOURCES += $(FORMATS:%=src/%Converter.cc)
+SOURCES += $(BUSSES:%=src/%Interface.cc)
+SOURCES += $(wildcard src/Stream*.cc)
+SOURCES += src/StreamVersion.c
+SOURCES_3.14 += src/devcalcoutStream.c
+
+HEADERS += StreamFormat.h
+HEADERS += StreamFormatConverter.h
+HEADERS += StreamBuffer.h
+HEADERS += StreamError.h
+
+ifeq (${EPICS_BASETYPE},3.13)
+USR_INCLUDES += -include $(INSTALL_INCLUDE)/compat3_13.h
+endif
+
+StreamCore.o: streamReferences
+
+streamReferences:
+	@for i in $(BUSSES); \
+	do echo "extern void* ref_$${i}Interface;"; \
+           echo "void* p$$i = ref_$${i}Interface;"; \
+	done > $@
+	@for i in $(FORMATS); \
+	do echo "extern void* ref_$${i}Converter;"; \
+           echo "void* p$$i = ref_$${i}Converter;"; \
+	done >> $@
+
+ifeq (${EPICS_BASETYPE},3.13)
+stream.dbd:
+	@for r in $(RECORDTYPES); \
+	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
+	done > $@
+	@echo "driver(stream)" >> $@
+else
+stream.dbd:
+	@for r in $(RECORDTYPES) calcout; \
+	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
+	done > $@
+	@echo "driver(stream)" >> $@
+	@echo "variable(streamDebug, int)" >> $@
+	@echo "registrar(streamRegistrar)" >> $@
+endif