Renamed CONFIG_EXTENSIONS to CONFIG_SITE. Moved includes to CONFIG.

Moved INSTALL_LOCATION definition.
2006-03-29 17:08:23 +00:00
parent 8774f97acd
commit c0a6adb516
4 changed files with 50 additions and 43 deletions
@@ -1,8 +1,41 @@
 # $Id$

-include $(TOP)/configure/CONFIG_EXTENSIONS
-# Add any changes to make rules here
+INSTALL_IDLFILE = $(INSTALL)

-#CROSS_COMPILER_TARGET_ARCHS =
-#SHARED_LIBRARIES = NO
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+
+CONFIG=$(EPICS_BASE)/configure
+include $(CONFIG)/CONFIG
+
+# Override for definition in base
+INSTALL_LOCATION = $(TOP)
+include $(TOP)/configure/CONFIG_SITE
+
+ifdef INSTALL_LOCATION_EXTENSIONS
+INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
+endif
+
+#  Site specific host architecture definitions
+-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+
+ifdef 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
+
+endif

@@ -1,36 +0,0 @@
-# $Id$
-
-INSTALL_IDLFILE = $(INSTALL)
-
-include $(TOP)/configure/RELEASE
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
-
-CONFIG=$(EPICS_BASE)/configure
-include $(CONFIG)/CONFIG
-
-INSTALL_LOCATION = $(TOP)
-ifdef INSTALL_LOCATION_EXTENSIONS
-INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
-endif
-
-#  Site specific host architecture definitions
-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-
-ifdef 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
-
-endif
-
@@ -0,0 +1,12 @@
+# $Id$
+
+# Make any extensions-specific changes to the EPICS build
+# configuration variables in this file.
+
+# Extensions should not normally be built for cross targets
+CROSS_COMPILER_TARGET_ARCHS =
+
+# If you don't want to install into $(TOP) then
+# define INSTALL_LOCATION here
+#INSTALL_LOCATION=<fullpathname>
+
@@ -1,8 +1,6 @@
 # $Id$

-# If you don't want to install into $(TOP) dir then
-# define INSTALL_LOCATION_EXTENSIONS here
-#INSTALL_LOCATION_EXTENSIONS=<fullpathname>
+# Define INSTALL_LOCATION in CONFIG_SITE

 # Location of external products
 EPICS_BASE=_EPICS_BASE_