Commit c5a0a42e authored by ghweber's avatar ghweber

Use different repath for executables and plugins. Update spencer config file to use TCMALLOC.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@4697 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1db84d39
......@@ -128,3 +128,6 @@ DEFAULT_CCMIO_INCLUDE=$VISITHOME/ccmio/2.6.1/linux-x86_64_gcc-4.2.1/include
DEFAULT_CCMIO_LIB=$VISITHOME/ccmio/2.6.1/linux-x86_64_gcc-4.2.1/lib
##
## TCMALLOC
##
DEFAULT_TCMALLOC_DIR=$VISITHOME/google-perftools/0.98/linux-x86_64_gcc-4.2.1/lib
This diff is collapsed.
......@@ -3453,6 +3453,11 @@ fi
SHLIB_POSTPROCESS="mv $""(LIBSHAREDTEMP) $""@"
SHLIB_POSTPROCESS_SER="mv $""(LIBSHAREDTEMPSER) $""@"
SHLIB_POSTPROCESS_PAR="mv $""(LIBSHAREDTEMPPAR) $""@"
EXE_LDFLAGS=${EXE_LDFLAGS-""}
PLUGIN_LDFLAGS=${PLUGIN_LDFLAGS-""}
AC_SUBST(EXE_LDFLAGS)
AC_SUBST(PLUGIN_LDFLAGS)
case $SHORT_UNAME in
freebsd)
# Expecting g++
......@@ -3549,9 +3554,9 @@ case $SHORT_UNAME in
if test -z "$SHLIB_CREATEPROG"; then
SHLIB_CREATEPROG="$""(CXX) -shared -o"
fi
# Set RPATH relative to executable
LDFLAGS="$LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../lib"
EXE_LDFLAGS="$LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../lib"
PLUGIN_LDFLAGS="$LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../../lib"
;;
darwin)
......
......@@ -50,7 +50,7 @@
@SET_MAKE@
@VARIABLES@
LIBS=@QT_LIBS@ $(X_LIBS) @LIBS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@CPPFLAGS@ -I$(TOPDIR)/include/visit -I.
......
......@@ -352,10 +352,10 @@ clean:
## Other targets...
##
@ENGINE_SER@ or_no_ser: $(SERLIBDEP) $(SEROBJ) $(MAINSEROBJ) $(LIBSHAREDSER)
$(CXX) -o $@ $(LDFLAGS) $(MAINSEROBJ) -lengine_ser $(SERLIBS)
$(CXX) -o $@ $(LDFLAGS) @EXE_LDFLAGS@ $(MAINSEROBJ) -lengine_ser $(SERLIBS)
@ENGINE_PAR@ or_no_par: $(PARLIBDEP) $(PAROBJ) $(MAINPAROBJ) $(LIBSHAREDPAR)
$(CXX) -o $@ $(LDFLAGS) $(MAINPAROBJ) -lengine_par $(PARLIBS) \
$(CXX) -o $@ $(LDFLAGS) @EXE_LDFLAGS@ $(MAINPAROBJ) -lengine_par $(PARLIBS) \
@ICET_LDFLAGS@ @ICET_LIBS@ @LIBCOGNOMEN@
$(ENGINEWRAPSER) or_no_ser_wrapper: $(SERLIBDEP) $(SEROBJ) $(LIBRARYSEROBJ) $(LIBSHAREDSER)
......
......@@ -400,7 +400,7 @@ LIBS=-lplugin $(QT_LIBS) $(QUI_LIBS) -L../lib -lviewerproxy -lviewerrpc \
-lmisc -lstate -lcomm -lavtexceptions -lutility -lexpr -lparser \
-lwinutil $(X_LIBS) @LIBS@ @PTHREAD_LIB@ @GUIFRAMEWORKS@
LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@
LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
CXXFLAGS=-I. @CXXFLAGS@ @QT_CXXFLAGS@ -I../include/visit
......
......@@ -24,6 +24,8 @@ F77=@F77@
F77FLAGS=@FFLAGS@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
EXE_LDFLAGS=@EXE_LDFLAGS@
PLUGIN_LDFLAGS=@PLUGIN_LDFLAGS@
LDFLAGSORIG=@LDFLAGS@
PY_LDFLAGS=@PY_LDFLAGS@
QT_LDFLAGS=@QT_LDFLAGS@
......
......@@ -157,55 +157,55 @@
*/
#undef PTY_SYSV
/* The size of a `boolean', as computed by sizeof. */
/* The size of `boolean', as computed by sizeof. */
#undef SIZEOF_BOOLEAN
/* The size of a `char', as computed by sizeof. */
/* The size of `char', as computed by sizeof. */
#undef SIZEOF_CHAR
/* The size of a `double', as computed by sizeof. */
/* The size of `double', as computed by sizeof. */
#undef SIZEOF_DOUBLE
/* The size of a `float', as computed by sizeof. */
/* The size of `float', as computed by sizeof. */
#undef SIZEOF_FLOAT
/* The size of a `int', as computed by sizeof. */
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of a `long', as computed by sizeof. */
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of a `long double', as computed by sizeof. */
/* The size of `long double', as computed by sizeof. */
#undef SIZEOF_LONG_DOUBLE
/* The size of a `long float', as computed by sizeof. */
/* The size of `long float', as computed by sizeof. */
#undef SIZEOF_LONG_FLOAT
/* The size of a `long long', as computed by sizeof. */
/* The size of `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG
/* The size of a `off64_t', as computed by sizeof. */
/* The size of `off64_t', as computed by sizeof. */
#undef SIZEOF_OFF64_T
/* The size of a `short', as computed by sizeof. */
/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of a `unsigned char', as computed by sizeof. */
/* The size of `unsigned char', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_CHAR
/* The size of a `unsigned int', as computed by sizeof. */
/* The size of `unsigned int', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_INT
/* The size of a `unsigned long', as computed by sizeof. */
/* The size of `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
/* The size of a `unsigned long long', as computed by sizeof. */
/* The size of `unsigned long long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG_LONG
/* The size of a `unsigned short', as computed by sizeof. */
/* The size of `unsigned short', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_SHORT
/* The size of a `void *', as computed by sizeof. */
/* The size of `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P
/* Define the slash character */
......
......@@ -61,7 +61,7 @@ FSEROBJ=$(SIMFSRC:.f=.o)
CPPFLAGS=-I. @CPPFLAGS@
CFLAGS=-I. -I$(TOPDIR)/include/visit -Wimplicit-function-declaration @CFLAGS@
F77FLAGS=-I$(TOPDIR)/include/visit
LDFLAGS=@LDFLAGS@ -L$(TOPDIR)/archives
LDFLAGS=@LDFLAGS@ @EXE_LDFLAGS@ -L$(TOPDIR)/archives
PARLIBS=@MPI_LIBS@
......
......@@ -66,7 +66,7 @@ SIMFLIBNAME=$(TOPDIR)/archives/$(SIMFLIB).a
##
## Override the certain variables with values from configure.
##
LDFLAGS=-L../lib @PY_LDFLAGS@ @LDFLAGS@
LDFLAGS=-L../lib @PY_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBS=@LIBS@
CXXFLAGS=@CXXFLAGS@ @PY_CXXFLAGS@ -I. -I../../include/visit
CFLAGS= -I. -I../../include/visit
......
......@@ -739,10 +739,10 @@ export VISUS_VERSION=${VISUS_VERSION-"1.0.0"}
export VISUS_COMPATIBILITY_VERSION=${VISUS_COMPATIBILITY_VERSION-"1.0"}
export VISUS_DIR=${VISUS_DIR-"visus"}
export TCMALLOC_FILE=${TCMALLOC_FILE-"google-perftools-0.97.tar.gz"}
export TCMALLOC_VERSION=${TCMALLOC_VERSION-"0.97"}
export TCMALLOC_COMPATIBILITY_VERSION=${TCMALLOC_COMPATIBILITY_VERSION-"0.97"}
export TCMALLOC_DIR=${TCMALLOC_DIR-"google-perftools-0.97"}
export TCMALLOC_FILE=${TCMALLOC_FILE-"google-perftools-0.98.tar.gz"}
export TCMALLOC_VERSION=${TCMALLOC_VERSION-"0.98"}
export TCMALLOC_COMPATIBILITY_VERSION=${TCMALLOC_COMPATIBILITY_VERSION-"0.98"}
export TCMALLOC_DIR=${TCMALLOC_DIR-"google-perftools-0.98"}
# Dialog-related variables.
DLG="dialog"
......
......@@ -49,7 +49,7 @@
# Override some make variables
#
CFLAGS=@CFLAGS@ -g -I. -I$(TOPDIR)/include -I$(TOPDIR)/include/visit
LDFLAGS=@LDFLAGS@ @EXPORT_DYNAMIC@ -L$(TOPDIR)/archives
LDFLAGS=@LDFLAGS@ @EXE_LDFLAGS@ @EXPORT_DYNAMIC@ -L$(TOPDIR)/archives
LIBS=@LIBS@ -lsim
F77FLAGS=-I$(TOPDIR)/include/visit
FLIBS=@LIBS@ -lsimf -lsim
......
......@@ -58,7 +58,7 @@ WIDGETS = ClipEditor.h Viewer.h
# Compile flags
# -------------
LIBS=@QT_LIBS@ $(X_LIBS) @LIBS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@CPPFLAGS@ -I$(TOPDIR)/include/visit -I.
......
......@@ -59,7 +59,7 @@
@SET_MAKE@
@VARIABLES@
LIBS=@QT_LIBS@ $(SILO_LIB) $(X_LIBS) @LIBS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@CPPFLAGS@ @SILO_INCLUDE@ -I$(TOPDIR)/include/visit -I.
......
......@@ -65,7 +65,7 @@ LIBNAME=$(LIB).@SHLIB_SOEXT@
##
## Override the certain variables with values from configure.
##
LDFLAGS=-L../../lib @PY_LDFLAGS@ @LDFLAGS@
LDFLAGS=-L../../lib @PY_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBS=@LIBS@ -lviewerproxy -lviewerrpc -lcomm -lmisc -lstate -lutility \
-lplugin -ldbatts -lavtexceptions -lexpr -lparser @PY_LIB@
CXXFLAGS=@CXXFLAGS@ @PY_CXXFLAGS@ -I. -I../../include/visit
......
......@@ -344,9 +344,9 @@ class MakefileGeneratorPlugin : public Plugin
out << "CPPFLAGS=$(CPPFLAGSORIG) $(VTK_INCLUDE) -I. -I"<<visithome<<"/include -I"<<visithome<<"/include/mesa -I"<<visithome<<"/include/visit $(PY_CXXFLAGS)" << endl;
#endif
if(type == "database")
out << "LDFLAGS=$(LDFLAGSORIG) ";
out << "LDFLAGS=$(LDFLAGSORIG) $(PLUGIN_LDFLAGS)";
else
out << "LDFLAGS=$(LDFLAGSORIG) $(PY_LDFLAGS) ";
out << "LDFLAGS=$(LDFLAGSORIG) $(PLUGIN_LDFLAGS) $(PY_LDFLAGS) ";
for (size_t i=0; i<ldflags.size(); i++)
out << " " << ldflags[i];
out << " -L" << visitplugininstall << "/" << type << "s";
......
......@@ -116,7 +116,7 @@ SRC=main.C
OBJ=$(SRC:.C=.o)
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@ -I. -I../../include -I../../include/visit
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@ @QT_LIBS@ @LIBS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@ @QT_LIBS@ @LIBS@
all: $(PROGRAM1) $(PROGRAM2) $(PROGRAM3) $(PROGRAM4) $(PROGRAM5) $(PROGRAM6) $(PROGRAM7) $(PROGRAM8)
......
......@@ -89,7 +89,7 @@ WIDGET=XMLEdit.h \
OBJ=$(SRC:.C=.o)
MOCSRC=$(WIDGET:.h=_moc.C)
MOCOBJ=$(WIDGET:.h=_moc.o)
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@
LDFLAGS=@QT_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBS=@QT_LIBS@ $(X_LIBS) @LIBS@
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@CPPFLAGS@ -I$(TOPDIR)/include/visit -I../xml -I.
......
......@@ -333,7 +333,7 @@ LIBS=-L../../lib -L../../vtkqt -lengineproxy -lenginerpc -lviewerrpc \
@QT_LIBS@ -lproxybase -lmisc -lcomm -lstate -lutility -lavtexceptions \
$(VTK_LIBS) $(X_LIBS) $(BZIP2_LIBS) $(GLEW_LIBS) $(FILIB_LIBS) @LIBS@ @PTHREAD_LIB@
LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@
LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@ @EXE_LDFLAGS@
LIBDEP=
CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@
CPPFLAGS=@PLATFORM_CPPFLAGS@ @CPPFLAGS@ @VIEWER_MESA_STUB_CPPFLAGS@ $(VTK_INCLUDE) -I../../vtkqt \
......
......@@ -84,7 +84,7 @@ CLI=$(tmpbin)/cli
##
## Override the certain variables with values from configure.
##
LDFLAGS=@PY_LDFLAGS@ @LDFLAGS@
LDFLAGS=@PY_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBS=@LIBS@ -lviewerproxy -lviewerrpc -lcomm -lmisc -lstate -lutility \
-lplugin -ldbatts -lavtexceptions -lexpr -lparser -lvisitpy @PY_LIB@
CXXFLAGS=@CXXFLAGS@ @PY_CXXFLAGS@ -I. -I../common -I../visitpy -I../../include/visit
......
......@@ -136,7 +136,7 @@ LIB=libvisitpy
##
## Override the certain variables with values from configure.
##
LDFLAGS=@PY_LDFLAGS@ @LDFLAGS@
LDFLAGS=@PY_LDFLAGS@ @LDFLAGS@ @EXE_LDFLAGS@
LIBS=@LIBS@ -lcomm -lmisc -lstate -lutility \
-lplugin -ldbatts -lavtexceptions -lexpr -lparser @PY_LIB@
CXXFLAGS=@CXXFLAGS@ @PY_CXXFLAGS@ -I. -I../../include/visit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment