From 662b518338911131a91c6d4807f6ed3444e49bb1 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Fri, 2 Nov 2018 17:12:31 -0700
Subject: [PATCH] separate softIocPy build

---
 Makefile                                   |  2 +
 devsupApp/src/Makefile                     | 42 ----------------
 pyIocApp/Makefile                          | 58 ++++++++++++++++++++++
 {devsupApp/src => pyIocApp}/devsupMain.cpp |  0
 4 files changed, 60 insertions(+), 42 deletions(-)
 create mode 100644 pyIocApp/Makefile
 rename {devsupApp/src => pyIocApp}/devsupMain.cpp (100%)

diff --git a/Makefile b/Makefile
index 2627e9a..b232814 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ define DIR_template
 endef
 $(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir))))
 
+pyIocApp_DEPEND_DIRS += devsupApp
+
 iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
 
 include $(TOP)/configure/RULES_TOP
diff --git a/devsupApp/src/Makefile b/devsupApp/src/Makefile
index 2208847..349b5be 100644
--- a/devsupApp/src/Makefile
+++ b/devsupApp/src/Makefile
@@ -23,8 +23,6 @@ setup_CPPFLAGS += -DXPYDEV_BASE=\"$(abspath $(INSTALL_LOCATION))\"
 setup_CPPFLAGS += -DXEPICS_BASE=\"$(EPICS_BASE)\"
 setup_CPPFLAGS += -DPYDIR=\"python$(PY_VER)\"
 
-devsupMain_CPPFLAGS += -DXPYDEV_BASE=\"$(abspath $(INSTALL_LOCATION))\"
-
 pyDevSup$(PY_LD_VER)_SRCS += setup.c
 pyDevSup$(PY_LD_VER)_SRCS += dbbase.c
 pyDevSup$(PY_LD_VER)_SRCS += dbrec.c
@@ -33,46 +31,6 @@ pyDevSup$(PY_LD_VER)_SRCS += dbdset.c
 
 pyDevSup$(PY_LD_VER)_LIBS += $(EPICS_BASE_IOC_LIBS)
 
-
-PROD_IOC = softIocPy$(PY_VER)
-PRODNAME = $(addsuffix $(EXE),$(PROD))
-
-# softIocPy.dbd will be created and installed
-DBD += softIocPy.dbd
-
-# softIocPy.dbd will be made up from these files:
-softIocPy_DBD += base.dbd
-softIocPy_DBD += pyDevSup.dbd
-
-softIocPy_DBD += system.dbd
-
-softIocPy$(PY_VER)_LIBS += pyDevSup$(PY_LD_VER)
-
-# softIocPy_registerRecordDeviceDriver.cpp derives from softIocPy.dbd
-softIocPy$(PY_VER)_SRCS += softIocPy_registerRecordDeviceDriver.cpp
-
-# Build the main IOC entry point on workstation OSs.
-softIocPy$(PY_VER)_SRCS_DEFAULT += devsupMain.cpp
-
-ifneq ($(DEVIOCSTATS),)
-softIocPy_DBD += devIocStats.dbd
-softIocPy$(PY_VER)_LIBS += devIocStats
-endif
-
-ifneq ($(AUTOSAVE),)
-softIocPy_DBD += asSupport.dbd
-softIocPy$(PY_VER)_LIBS += autosave
-endif
-
-ifneq ($(CAPUTLOG),)
-softIocPy_DBD += caPutLog.dbd
-softIocPy$(PY_VER)_LIBS += caPutLog
-endif
-
-# Finally link to the EPICS Base libraries
-softIocPy$(PY_VER)_LIBS += $(EPICS_BASE_IOC_LIBS)
-
-
 PY += devsup/__init__.py
 PY += devsup/_nullapi.py
 PY += devsup/db.py
diff --git a/pyIocApp/Makefile b/pyIocApp/Makefile
new file mode 100644
index 0000000..fe2bec3
--- /dev/null
+++ b/pyIocApp/Makefile
@@ -0,0 +1,58 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+PYMODULE = NO
+include $(TOP)/configure/CONFIG_PY
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+#=============================
+# Build the IOC application
+
+PROD_IOC = softIocPy$(PY_VER)
+PRODNAME = $(addsuffix $(EXE),$(PROD))
+
+# softIocPy.dbd will be created and installed
+DBD += softIocPy.dbd
+
+# softIocPy.dbd will be made up from these files:
+softIocPy_DBD += base.dbd
+softIocPy_DBD += pyDevSup.dbd
+
+softIocPy_DBD += system.dbd
+
+softIocPy$(PY_VER)_LIBS += pyDevSup$(PY_LD_VER)
+
+# softIocPy_registerRecordDeviceDriver.cpp derives from softIocPy.dbd
+softIocPy$(PY_VER)_SRCS += softIocPy_registerRecordDeviceDriver.cpp
+
+# Build the main IOC entry point on workstation OSs.
+softIocPy$(PY_VER)_SRCS_DEFAULT += devsupMain.cpp
+
+devsupMain_CPPFLAGS += -DXPYDEV_BASE=\"$(abspath $(INSTALL_LOCATION))\"
+
+ifneq ($(DEVIOCSTATS),)
+softIocPy_DBD += devIocStats.dbd
+softIocPy$(PY_VER)_LIBS += devIocStats
+endif
+
+ifneq ($(AUTOSAVE),)
+softIocPy_DBD += asSupport.dbd
+softIocPy$(PY_VER)_LIBS += autosave
+endif
+
+ifneq ($(CAPUTLOG),)
+softIocPy_DBD += caPutLog.dbd
+softIocPy$(PY_VER)_LIBS += caPutLog
+endif
+
+# Finally link to the EPICS Base libraries
+softIocPy$(PY_VER)_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+#===========================
+
+include $(TOP)/configure/RULES
+include $(TOP)/configure/RULES_PY
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
diff --git a/devsupApp/src/devsupMain.cpp b/pyIocApp/devsupMain.cpp
similarity index 100%
rename from devsupApp/src/devsupMain.cpp
rename to pyIocApp/devsupMain.cpp