Modifications to build system to better match areaDetector standard, fix build issues with example ioc.

.gitignore

@@ -1,3 +1,4 @@
+envPaths
 *~
 O.*
 bin
@@ -7,6 +8,5 @@ data
 documentation
 lib
 .svn*
-iocs/*IOC*
-iocs/example
 .idea
+*.local

ADPhantomApp/src/Makefile

@@ -18,16 +18,9 @@ createParamIncludes_SRCS += ADPhantomSupport.cpp
 phantom_SRCS += ADPhantom.cpp
 phantom_SRCS += ADPhantomSupport.cpp
 
-phantom_LIBS += asyn
-phantom_LIBS += ADBase
-phantom_LIBS += busy
-
-phantom_SYS_LIBS += pcap
-
 DATA += phantom_hdf5.xml
 
-# We need to link against the EPICS Base libraries
-phantom_LIBS += $(EPICS_BASE_IOC_LIBS)
+include $(ADCORE)/ADApp/commonLibraryMakefile
 
 
 include $(TOP)/configure/RULES

Makefile

@@ -1,28 +1,23 @@
 #Makefile at top of application tree
 TOP = .
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), configure)
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocBoot))
+DIRS := $(DIRS) configure
+DIRS := $(DIRS) ADPhantomApp
 
-define DIR_template
- $(1)_DEPEND_DIRS = configure
-endef
-$(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir))))
-
-iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
-
-# Comment out the following lines to disable creation of example iocs and documentation
-#DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard etc))
-
-#ifeq ($(wildcard etc),etc)
-#	include $(TOP)/etc/makeIocs/Makefile.iocs
-#	UNINSTALL_DIRS += documentation/doxygen $(IOC_DIRS)
-#endif
-
-# Comment out the following line to disable building of example iocs
-#DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocs))
+ADPhantomApp_DEPEND_DIRS += configure
+ifeq ($(BUILD_IOCS), YES)
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocs))
+iocs_DEPEND_DIRS += ADPhantomApp
+endif
 
 include $(TOP)/configure/RULES_TOP
 
+uninstall: uninstall_iocs
+uninstall_iocs:
+	$(MAKE) -C iocs uninstall
+.PHONY: uninstall uninstall_iocs
 
+realuninstall: realuninstall_iocs
+realuninstall_iocs:
+	$(MAKE) -C iocs realuninstall
+.PHONY: realuninstall realuninstall_iocs

configure/CONFIG_SITE

@@ -1,3 +1,5 @@
+
+
 # CONFIG_SITE
 
 # Make any application-specific changes to the EPICS build
@@ -19,7 +21,7 @@ CHECK_RELEASE = YES
 # Set this when you only want to compile this application
 #   for a subset of the cross-compiled target architectures
 #   that Base is built for.
-CROSS_COMPILER_TARGET_ARCHS = 
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 
 # To install files into a location other than $(TOP) define
 #   INSTALL_LOCATION here.
@@ -32,34 +34,13 @@ CROSS_COMPILER_TARGET_ARCHS =
 #   take effect.
 #IOCS_APPL_TOP = </IOC/path/to/application/top>
 
-USR_CPPFLAGS_Linux += -std=c++11
-USR_CPPFLAGS_Linux += -O3
-
-#Switch these on for debugging
-HOST_OPT=NO
-CROSS_OPT=NO
-#USR_CXXFLAGS=-g
-#USR_LDFLAGS=-g
-#USR_CPPFLAGS_Linux += -g
-#USR_CFLAGS_Linux += -g
-#USR_LDFLAGS_Linux += -g
-STATIC_BUILD=YES
-
-#Switch these on for gprof profiling
-#USR_CXXFLAGS=-pg
-#USR_LDFLAGS=-pg
-#USR_CPPFLAGS_Linux += -pg
-#USR_CPPFLAGS_Linux += -Og
-#USR_CFLAGS_Linux += -pg
-#USR_LDFLAGS_Linux += -pg
-
-USR_CXXFLAHS=-O3
-
 # Get settings from AREA_DETECTOR, so we only have to configure once for all detectors if we want to
-#-include $(AREA_DETECTOR)/configure/CONFIG_SITE
-#-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
-#-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-#ifdef T_A
-#  -include $(AREA_DETECTOR)/configure/CONFIG_SITE.Common.$(T_A)
-#  -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-#endif
+-include $(AREA_DETECTOR)/configure/CONFIG_SITE
+-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
+-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+  -include $(AREA_DETECTOR)/configure/CONFIG_SITE.Common.$(T_A)
+  -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+-include $(TOP)/configure/CONFIG_SITE.local

configure/RELEASE

@@ -1,38 +1,7 @@
-# RELEASE - Location of external support modules
-#
-# IF YOU MAKE ANY CHANGES to this file you must subsequently
-# do a "gnumake rebuild" in this application's top level
-# directory.
-#
-# The build process does not check dependencies against files
-# that are outside this application, thus you should do a
-# "gnumake rebuild" in the top level directory after EPICS_BASE
-# or any other external module pointed to below is rebuilt.
-#
-# Host- or target-specific settings can be given in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-#
-# This file should ONLY define paths to other support modules,
-# or include statements that pull in similar RELEASE files.
-# Build settings that are NOT module paths should appear in a
-# CONFIG_SITE file.
+#RELEASE Location of external products
+# Run "gnumake clean uninstall install" in the application
+# top directory each time this file is changed.
 
-TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
-
-#SUPPORT=/home/pbt/VBI/trunk/src/epics/R3.14.12.5/modules
-SUPPORT=/dls_sw/prod/R3.14.12.7/support
-
-ASYN =              $(SUPPORT)/asyn/4-39
-AREADETECTOR =      $(SUPPORT)/ADCore/3-9dls2
-ADCORE =            $(SUPPORT)/ADCore/3-9dls2
-BUSY =              $(SUPPORT)/busy/1-7-2dls3
-
-# EPICS_BASE usually appears last so other apps can override stuff:
-#EPICS_BASE=/home/pbt/VBI/trunk/src/epics/R3.14.12.5/base
-EPICS_BASE=/dls_sw/epics/R3.14.12.7/base
-
-# 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
+-include $(TOP)/../configure/RELEASE_LIBS_INCLUDE
+-include $(TOP)/RELEASE.local
+-include $(TOP)/configure/RELEASE.local