Changes for hp700 build

src/makeBaseApp/top/configure/CONFIG_APP

@@ -1,29 +1,16 @@
-#CONFIG_APP 
+# CONFIG_APP
+
 include $(TOP)/configure/RELEASE
 -include $(TOP)/configure/RELEASE.$(HOST_ARCH)
 CONFIG=$(EPICS_BASE)/configure
-include $(EPICS_BASE)/configure/CONFIG
+include $(CONFIG)/CONFIG
 INSTALL_LOCATION = $(TOP)
 ifdef INSTALL_LOCATION_APP
 INSTALL_LOCATION = $(INSTALL_LOCATION_APP)
 endif
 
-#Other share areas can be added similar to following
-#ifdef <share_top>
-#USR_INCLUDES += -I$(<share_top>)/include
-#<share_top>BIN = $(<share_top>)/bin/$(T_A)
-#endif
-
-ifdef SHARE
-USR_INCLUDES += -I$(SHARE)/include
-SHARE_BIN = $(SHARE)/bin/$(T_A)
-USER_DBDFLAGS += -I .. -I $(SHARE)/dbd -I $(EPICS_BASE)/dbd
-endif
-
-#Following only works if host provides soft links
-ifdef MASTER_IOCAPPS
-USR_INCLUDES += -I$(MASTER_IOCAPPS)/include
-MASTER_IOCAPPS_BIN = $(MASTER_IOCAPPS)/bin/$(T_A)
+ifdef T_A
+-include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
 endif
 
 # Where to install databases
@@ -32,4 +19,3 @@ INSTALL_DB = $(INSTALL_LOCATION)/db
 DB_OPT = NO
 # May be overridden if not all databases should be installed
 INSTALLDB = $(DB)
-#######include $(TOP)/configure/CONFIG

src/makeBaseApp/top/configure/Makefile

@@ -6,6 +6,7 @@ TOP=..
 include $(TOP)/configure/CONFIG
 
 TARGETS = CONFIG_APP_INCLUDE
+IOC_TARGETS = $(TARGETS)
 
 include $(TOP)/configure/RULES_BUILD
 

src/makeBaseApp/top/configure/RULES.registerRecordDeviceDriver

@@ -1,6 +1,6 @@
 registerRecordDeviceDriver.o: registerRecordDeviceDriver.c
 
-registerRecordDeviceDriver.c: $(TOP)/dbd/$(EXPANDED_DBD)
+registerRecordDeviceDriver.c: $(TOP)/dbd/$(DBDNAME)
 	$(RM) registerRecordDeviceDriver.c
 	$(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl \
-	$(TOP)/dbd/$(EXPANDED_DBD) > registerRecordDeviceDriver.c
+	$(TOP)/dbd/$(DBDNAME) > registerRecordDeviceDriver.c

src/makeBaseApp/top/configure/makeConfigAppInclude.pl

@@ -1,7 +1,7 @@
 # $Id$ 
 
 eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
-    if $running_under_some_shell; # makeIocCdCommands.pl
+    if $running_under_some_shell; # makeConfigAppInclude.pl
 
 use Cwd;
 
@@ -11,7 +11,7 @@ $top = $ARGV[2];
 
 unlink("${outfile}");
 open(OUT,">${outfile}") or die "$! opening ${outfile}";
-print OUT "#Do not modify thie file.\n";
+print OUT "#Do not modify this file.\n";
 print OUT "#This file is created during the build.\n";
 
 @files =();
@@ -49,10 +49,10 @@ foreach $file (@files) {
                 print OUT "${prefix}_LIB = $post/lib/${arch}\n";
             }
             if ( -d "$post/include") { #check that directory exists
-                print OUT "USR_INCLUDES += -I$post/include\n";
+                print OUT "INSTALL_INCLUDES += -I$post/include\n";
             }
             if ( -d "$post/dbd") { #check that directory exists
-                print OUT "USER_DBDFLAGS += -I$post/dbd\n";
+                print OUT "INSTALL_DBDFLAGS += -I $post/dbd\n";
             }
         }
     }

src/makeBaseApp/top/exampleApp/src/Makefile

@@ -3,7 +3,6 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 
-USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd
 RECTYPES += xxxRecord.h
 DBDEXPAND = exampleInclude.dbd
 DBDNAME = exampleApp.dbd
@@ -34,11 +33,10 @@ LIBOBJS += $(EPICS_BASE_BIN)/seq
 #LIBOBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o
 
 # or
-EXPANDED_DBD = exampleApp.dbd
-exampleLib_SRCS += registerRecordDeviceDriver.c
-#end choices
 
-DBD = exampleApp.dbd
+exampleLib_SRCS += registerRecordDeviceDriver.c
+
+#end choices
 
 -include ../baseLIBOBJS