From 8370a97866c8fc09d0a76b82b4640eca8cca9d92 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 3 Apr 2014 16:57:14 -0500
Subject: [PATCH] Unify configure files with the other V4 modules Move
 include/pv setting into src/Makefile

---
 configure/CONFIG      | 23 +++++++++++------------
 configure/CONFIG_SITE |  5 +----
 configure/Makefile    |  8 --------
 src/Makefile          |  4 ++++
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/configure/CONFIG b/configure/CONFIG
index ae1e38d..c1a4703 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -1,30 +1,29 @@
-# CONFIG
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
 
-# You might want to change this to some shared set of rules, e.g.
-# RULES=/path/to/epics/support/modules/rules/x-y
-RULES=$(EPICS_BASE)
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
 
+# RELEASE files point to other application tops
 include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
 -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
 ifdef T_A
 -include $(TOP)/configure/RELEASE.Common.$(T_A)
 -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
-CONFIG=$(RULES)/configure
+CONFIG = $(RULES)/configure
 include $(CONFIG)/CONFIG
 
-# Override for definition in base
+# Override the Base definition:
 INSTALL_LOCATION = $(TOP)
-include $(TOP)/configure/CONFIG_SITE
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 ifdef T_A
  -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
  -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
- -include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
 endif
 
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 3feaabd..3e3e0d5 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -14,7 +14,7 @@
 # Set CHECK_RELEASE to NO to disable checking completely.
 # Set CHECK_RELEASE to WARN to perform consistency checking but
 #   continue building anyway if conflicts are found.
-CHECK_RELEASE = WARN
+CHECK_RELEASE = YES
 
 # To install files into a location other than $(TOP) define
 #   INSTALL_LOCATION here.
@@ -28,6 +28,3 @@ USR_CPPFLAGS += --coverage
 USR_LDFLAGS += --coverage
 endif
 
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
diff --git a/configure/Makefile b/configure/Makefile
index ade29a7..aefe673 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -2,14 +2,6 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
-# CHECK_RELEASE controls the consistency checking of the support
-# applications defined in the $(TOP)/configure/RELEASE* files.
-# Normally CHECK_RELEASE should be set to YES.
-# Set CHECK_RELEASE to NO to disable checking completely.
-# Set CHECK_RELEASE to WARN to perform consistency checking,
-# but continue the build even if conflicts are found.
-CHECK_RELEASE = YES
-
 TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
diff --git a/src/Makefile b/src/Makefile
index 617beb2..2859d79 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,6 +3,9 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I$(INSTALL_LOCATION)/include
+
 PVDATA_SRC = $(TOP)/src
 
 include $(PVDATA_SRC)/misc/Makefile
@@ -13,6 +16,7 @@ include $(PVDATA_SRC)/pvMisc/Makefile
 include $(PVDATA_SRC)/monitor/Makefile
 
 LIBRARY = pvData
+
 pvData_LIBS += Com
 
 include $(TOP)/configure/RULES