From d943f6966f7ff02c0e4d5e502ac154ffc18307b0 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 24 Feb 2016 17:39:29 -0600
Subject: [PATCH] Minor updates to the extensions/configure template

---
 src/makeBaseExt/top/configure/CONFIG       | 49 ++++++++++------------
 src/makeBaseExt/top/configure/RELEASE      | 23 +++++-----
 src/makeBaseExt/top/configure/RULES        |  8 +++-
 src/makeBaseExt/top/configure/RULES_PYTHON |  4 ++
 4 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/makeBaseExt/top/configure/CONFIG b/src/makeBaseExt/top/configure/CONFIG
index ab213ce52..321f6cea2 100644
--- a/src/makeBaseExt/top/configure/CONFIG
+++ b/src/makeBaseExt/top/configure/CONFIG
@@ -1,48 +1,43 @@
-# $Revision-Id$
+# CONFIG - Load build configuration data
+#
+# Do not make changes in this file, any site-specific
+# overrides should be given in a CONFIG_SITE 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)
+# Where the build rules come from
+RULES = $(EPICS_BASE)
 
 INSTALL_IDLFILE = $(INSTALL)
 
 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)
+  -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 some Base definitions
 INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain build configuration overrides
 include $(TOP)/configure/CONFIG_SITE
 
-ifdef INSTALL_LOCATION_EXTENSIONS
-INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
-endif
-
-#  Site specific host architecture definitions
+# Host-arch specific settings
 -include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+ifdef INSTALL_LOCATION_EXTENSIONS
+  INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
+endif
+
 ifdef T_A
+  # Target-arch specific settings
+  -include $(TOP)/configure/os/CONFIG_SITE.Common.$(T_A)
 
-#  Site specific target architecture definitions
--include $(TOP)/configure/os/CONFIG_SITE.Common.$(T_A)
-
-#  Cross compile specific definitions
-ifneq ($(EPICS_HOST_ARCH),$(T_A))
--include $(TOP)/configure/CONFIG.CrossCommon
-endif
-
-#  Site specific host-target combination definitions
--include $(TOP)/configure/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
--include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
--include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
-
+  #  Host & target specific combination settings
+  -include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
diff --git a/src/makeBaseExt/top/configure/RELEASE b/src/makeBaseExt/top/configure/RELEASE
index cb4c9cce2..2a7ad2714 100644
--- a/src/makeBaseExt/top/configure/RELEASE
+++ b/src/makeBaseExt/top/configure/RELEASE
@@ -1,22 +1,23 @@
-#RELEASE Location of external products
+# RELEASE Locations of external modules
 #
 # NOTE: The build does not check dependancies on files
 # external to this application. Thus you should run
 # "gnumake clean uninstall install" in the top directory
-# each time EPICS_BASE, SNCSEQ, or any other external
-# module defined in a RELEASE* file is rebuilt.
+# each time EPICS_BASE or any other external module that
+# is defined in a RELEASE* file gets rebuilt.
 #
-# Host/target specific settings can be specified in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+# Host/target specific paths can be specified in files named
+#   RELEASE.$(EPICS_HOST_ARCH).Common
+#   RELEASE.Common.$(T_A)
+#   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
 # Define INSTALL_LOCATION in CONFIG_SITE
 
-# Location of external products
-EPICS_BASE=_EPICS_BASE_
 EPICS_EXTENSIONS = $(TOP)
 
-# OAG_APPS may be needed by extension SDDS 
-#OAG_APPS=$(TOP)/../../oag/apps
+# Locations of external modules
 
+# OAG_APPS may be needed by the SDDS extension
+#OAG_APPS = $(TOP)/../../oag/apps
+
+EPICS_BASE = _EPICS_BASE_
diff --git a/src/makeBaseExt/top/configure/RULES b/src/makeBaseExt/top/configure/RULES
index 1ba776797..87f23cc85 100644
--- a/src/makeBaseExt/top/configure/RULES
+++ b/src/makeBaseExt/top/configure/RULES
@@ -1,5 +1,9 @@
 # $Revision-Id$
 
 include $(CONFIG)/RULES
-include $(TOP)/configure/RULES_PYTHON
-include $(TOP)/configure/RULES_IDL
+-include $(TOP)/configure/RULES_PYTHON
+-include $(TOP)/configure/RULES_IDL
+
+ifdef BASE_3_15
+  -include $(TOP)/configure/RULES_JAVA
+endif
diff --git a/src/makeBaseExt/top/configure/RULES_PYTHON b/src/makeBaseExt/top/configure/RULES_PYTHON
index c8522e01e..41bdc9e65 100644
--- a/src/makeBaseExt/top/configure/RULES_PYTHON
+++ b/src/makeBaseExt/top/configure/RULES_PYTHON
@@ -43,7 +43,11 @@ $(PYTHON_PACKAGE_PTH):
 %_wrap.c: ../%.i
 	$(SWIG) -python -o $@ $< 
 
+ifdef BASE_3_15
+clean:
+else
 clean::
+endif
 	@$(RM) *.py *.so *.pth
 
 endif