From a18f7f54a51f5158643d391609d343d4587d5f47 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Sun, 19 Dec 2010 15:25:51 +0100
Subject: [PATCH] change make to build only one library

---
 configure/RELEASE                             |  2 +
 configure/RULES                               |  2 -
 pvAccessApp/Makefile                          | 42 ++++++++++++++++---
 pvAccessApp/ca/Makefile                       | 17 --------
 pvAccessApp/client/Makefile                   | 17 --------
 .../ChannelAccessFactory.cpp                  |  0
 pvAccessApp/utils/Makefile                    | 26 ------------
 testApp/client/Makefile                       |  2 +-
 testApp/utils/Makefile                        | 12 +++---
 9 files changed, 45 insertions(+), 75 deletions(-)
 delete mode 100644 pvAccessApp/ca/Makefile
 delete mode 100644 pvAccessApp/client/Makefile
 rename pvAccessApp/{client => factory}/ChannelAccessFactory.cpp (100%)
 delete mode 100644 pvAccessApp/utils/Makefile

diff --git a/configure/RELEASE b/configure/RELEASE
index 119108e..d9792a0 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -27,6 +27,8 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 # EPICS_BASE usually appears last so other apps can override stuff:
 EPICS_BASE=/opt/epics/base
 
+PVDATA_HOME=/opt/epics/pvDataCPP
+
 # Set RULES here if you want to take build rules from somewhere
 # other than EPICS_BASE:
 #RULES=/path/to/epics/support/module/rules/x-y
diff --git a/configure/RULES b/configure/RULES
index 967561c..6d56e14 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -2,7 +2,5 @@
 
 include $(CONFIG)/RULES
 
-USR_INCLUDES += -I$(PVDATA_HOME)/include
-
 # Library should be rebuilt because LIBOBJS may have changed.
 $(LIBNAME): ../Makefile
diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile
index 70f50c9..d322037 100644
--- a/pvAccessApp/Makefile
+++ b/pvAccessApp/Makefile
@@ -1,9 +1,39 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
-DIRS += ca
-DIRS += utils
-DIRS += client #server
-#DIRS += localImpl remoteClientImpl remoteServerImpl
-#DIRS += localImplTest remoteImplTest
-include $(TOP)/configure/RULES_DIRS
 
+PVACCESS = $(TOP)/pvAccessApp/
+
+
+SRC_DIRS += $(PVACCESS)/ca
+INC += caConstants.h
+INC += version.h
+LIBSRCS += version.cpp
+
+
+SRC_DIRS += $(PVACCESS)/utils
+INC += hexDump.h
+INC += wildcharMatcher.h
+INC += arrayFIFO.h
+INC += growingCircularBuffer.h
+INC += inetAddressUtil.h
+INC += logger.h
+LIBSRCS += hexDump.cpp
+LIBSRCS += wildcharMatcher.cpp
+LIBSRCS += inetAddressUtil.cpp
+LIBSRCS += logger.cpp
+
+
+SRC_DIRS += $(PVACCESS)/client
+INC += pvAccess.h
+
+
+SRC_DIRS += $(PVACCESS)/factory
+LIBSRCS += ChannelAccessFactory.cpp
+
+
+
+
+LIBRARY = pvAccess
+pvAccess_LIBS += Com
+
+include $(TOP)/configure/RULES
diff --git a/pvAccessApp/ca/Makefile b/pvAccessApp/ca/Makefile
deleted file mode 100644
index 7710415..0000000
--- a/pvAccessApp/ca/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-INC += caConstants.h
-INC += version.h
-
-LIBSRCS += version.cpp
-
-LIBRARY = pvAccess
-
-#pvMisc_LIBS += Com
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
diff --git a/pvAccessApp/client/Makefile b/pvAccessApp/client/Makefile
deleted file mode 100644
index 81c3798..0000000
--- a/pvAccessApp/client/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-INC += pvAccess.h
-
-LIBSRCS += ChannelAccessFactory.cpp
-
-LIBRARY=pvAccessClient
-
-pvAccessClient_LIBS += pvData
-pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
diff --git a/pvAccessApp/client/ChannelAccessFactory.cpp b/pvAccessApp/factory/ChannelAccessFactory.cpp
similarity index 100%
rename from pvAccessApp/client/ChannelAccessFactory.cpp
rename to pvAccessApp/factory/ChannelAccessFactory.cpp
diff --git a/pvAccessApp/utils/Makefile b/pvAccessApp/utils/Makefile
deleted file mode 100644
index 7e7a593..0000000
--- a/pvAccessApp/utils/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-INC += hexDump.h
-INC += wildcharMatcher.h
-INC += arrayFIFO.h
-INC += growingCircularBuffer.h
-INC += inetAddressUtil.h
-INC += logger.h
-
-LIBSRCS += hexDump.cpp
-LIBSRCS += wildcharMatcher.cpp
-LIBSRCS += inetAddressUtil.cpp
-LIBSRCS += logger.cpp
-
-LIBRARY = pvAccessUtils
-pvAccessUtils_LIBS += Com
-pvAccessUtils_LIBS += pvData
-
-pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
diff --git a/testApp/client/Makefile b/testApp/client/Makefile
index 3d5e261..b47f508 100644
--- a/testApp/client/Makefile
+++ b/testApp/client/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configure/CONFIG
 
 PROD_HOST += testChannelAccessFactory
 testChannelAccessFactory_SRCS += testChannelAccessFactory.cpp
-testChannelAccessFactory_LIBS += pvAccessClient Com
+testChannelAccessFactory_LIBS += pvAccess Com
 
 include $(TOP)/configure/RULES
 #----------------------------------------
diff --git a/testApp/utils/Makefile b/testApp/utils/Makefile
index a2c4047..e8b6525 100644
--- a/testApp/utils/Makefile
+++ b/testApp/utils/Makefile
@@ -4,28 +4,28 @@ include $(TOP)/configure/CONFIG
 
 PROD_HOST += hexDumpTest
 hexDumpTest_SRCS += hexDumpTest.cpp
-hexDumpTest_LIBS += pvAccessUtils
+hexDumpTest_LIBS += pvAccess
 
 PROD_HOST += wildcharMatcherTest
 wildcharMatcherTest_SRCS += wildcharMatcherTest.cpp
-wildcharMatcherTest_LIBS += pvAccessUtils Com
+wildcharMatcherTest_LIBS += pvAccess Com
 
 PROD_HOST += arrayFIFOTest
 arrayFIFOTest_SRCS += arrayFIFOTest.cpp
-arrayFIFOTest_LIBS += pvAccessUtils Com
+arrayFIFOTest_LIBS += pvAccess Com
 
 PROD_HOST += growingCircularBufferTest
 growingCircularBufferTest_SRCS += growingCircularBufferTest.cpp
-growingCircularBufferTest_LIBS += pvAccessUtils Com
+growingCircularBufferTest_LIBS += pvAccess Com
 
 PROD_HOST += inetAddressUtilsTest
 inetAddressUtilsTest_SRCS += inetAddressUtilsTest.cpp
-inetAddressUtilsTest_LIBS += pvAccessUtils Com pvData
+inetAddressUtilsTest_LIBS += pvAccess Com pvData
 pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
 
 PROD_HOST += loggerTest
 loggerTest_SRCS += loggerTest.cpp
-loggerTest_LIBS += pvAccessUtils Com
+loggerTest_LIBS += pvAccess Com
 
 
 include $(TOP)/configure/RULES