From 8d2cd8b96cb8b176ca13f43dd416b17075d0c35f Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Tue, 9 Nov 2010 14:55:13 -0600 Subject: [PATCH] Updated to match extensions/configure. --- src/makeBaseExt/top/configure/CONFIG | 6 +++++- .../os/CONFIG_SITE.linux-x86.linux-x86 | 3 ++- .../os/CONFIG_SITE.linux-x86_64.linux-x86_64 | 2 +- .../CONFIG_SITE.solaris-sparc.solaris-sparc | 7 +++++-- ...TE.solaris-sparc64-gnu.solaris-sparc64-gnu | 2 +- ...ONFIG_SITE.solaris-sparc64.solaris-sparc64 | 6 ++++++ .../os/CONFIG_SITE.win32-x86.win32-x86 | 21 ++++++++++++++----- 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/makeBaseExt/top/configure/CONFIG b/src/makeBaseExt/top/configure/CONFIG index 9275c9401..ab213ce52 100644 --- a/src/makeBaseExt/top/configure/CONFIG +++ b/src/makeBaseExt/top/configure/CONFIG @@ -1,5 +1,9 @@ # $Revision-Id$ +# 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) + INSTALL_IDLFILE = $(INSTALL) include $(TOP)/configure/RELEASE @@ -10,7 +14,7 @@ ifdef T_A -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A) endif -CONFIG=$(EPICS_BASE)/configure +CONFIG=$(RULES)/configure include $(CONFIG)/CONFIG # Override for definition in base diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 b/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 index c44ec762c..b24d14bdd 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 @@ -31,7 +31,8 @@ TK_TCL = /usr/lib IDL = #JAVA_DIR=/usr/local/java -JAVA_DIR=/usr/java/j2sdk1.4.1 +#JAVA_DIR=/usr/java/j2sdk1.4.1 +JAVA_DIR=/usr JAVA_INC=$(JAVA_DIR)/include INTERVIEWS_BIN=/usr/local/interviews/bin/O.Linux diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 b/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 index c63411a2b..d2ab00e9d 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64 @@ -30,7 +30,7 @@ JAVA_DIR=/usr # Sciplot and XRTgraph used by medm SCIPLOT=YES #XRTGRAPH_EXTENSIONS = YES -#XRTGRAPH = /usr/local/xrtgraph +#XRTGRAPH = /usr/local/xrtgraph64 XRTGRAPH_EXTENSIONS = XRTGRAPH = diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc b/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc index a44797fad..23d2ffb3e 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc @@ -38,10 +38,13 @@ IV_LIB=/usr/local/interviews/lib/O.solaris WINGZ_INC = /opt/local/Wingz2/incl WINGZ_LIB = /opt/local/Wingz2/lib #MATHEMATICA = /usr/local/math + # Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x # and you want the extensions for MEDM -XRTGRAPH_EXTENSIONS = YES -XRTGRAPH = /opt/local/xrtgraph +#XRTGRAPH_EXTENSIONS = YES +#XRTGRAPH = /opt/local/xrtgraph +SCIPLOT = YES + QUESTWIN = /usr/local/questwin TK_LIB = /opt/local/lib diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu b/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu index d2e6e2627..8de3cfde9 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu @@ -10,5 +10,5 @@ # leave the line empty. # --include $(TOP)/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc +-include $(TOP)/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 b/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 index e3c6a9715..2d4e3a497 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.solaris-sparc64.solaris-sparc64 @@ -18,3 +18,9 @@ ATLAS_LIB = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUSIII_4/lib F2C_LIB = /usr/local/oag/3rdParty/F2C/SunOS_SunUSIII_4/lib CLAPACK_INCLUDE = /usr/local/oag/3rdParty/CLAPACK/SunOS_SunUSIII_4/include ATLAS_INCLUDE = /usr/local/oag/3rdParty/ATLAS/SunOS_SunUSIII_4/include + +# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x +# and you want the extensions for MEDM +#XRTGRAPH_EXTENSIONS = +#XRTGRAPH = +SCIPLOT = YES diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 b/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 index 6679b1b93..8118893a7 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 @@ -86,9 +86,9 @@ QUESTWIN = # Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x # and you want the extensions for MEDM XRTGRAPH_EXTENSIONS = NO -XRTGRAPH = -# Define SCIPLOT if you don't have XRT/graph -#SCIPLOT = YES +#XRTGRAPH = + +SCIPLOT = YES # z library created in SDDS extension ZLIB_CFLAG = -DzLib @@ -98,8 +98,7 @@ z_DIR = $(EPICS_EXTENSIONS_LIB) CLAPACK_INCLUDE = c:/CLAPACK/include CLAPACK_LIB = c:/CLAPACK/lib - -EXCEED = Exceed7.10 +EXCEED = Exceed13.0 ifeq ($(EXCEED),Exceed5) X11_LIB = c:/exceed5/xdk/lib @@ -191,6 +190,18 @@ ifeq ($(EXCEED),Exceed12.0) HCLXmu_DIR=$(X11_LIB) EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP endif +ifeq ($(EXCEED),Exceed13.0) + XDK=C:/Exceed13.0/XDK + X11_LIB = $(XDK)/lib + X11_INC = $(XDK)/include + EXCEED_XLIBS=XmStatic XmStatXt Xlib HCLXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + Xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP +endif + ###################################################### # Override for XFree86/LessTif