Changeset 577 for trunk

Timestamp:

Feb 19, 2007, 6:18:34 AM (18 years ago)

Author:

dkearney

Message:

adding src2/core as a target to configure, adjusting makefile to build shared and static librappture2 libraries

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)

trunk/Makefile.in

@@ -31 +31 @@
 rplib:
         set -x;
+        cd src2/core; make clean; make librappture2.a; make librappture2.so.0.0
         cd src; make clean; make librappture;
 
 install_rplib:
         set -x;
+        cd src2/core; make install;
         cd src; make install_rappture;
 

trunk/configure

@@ -5302 +5302 @@
 
 
-ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile test/Makefile gui/apps/rappture"
+ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile src2/core/Makefile test/Makefile gui/apps/rappture"
 
 cat >confcache <<\_ACEOF
@@ -5882 +5882 @@
     "src/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES src/matlab/Makefile" ;;
     "src/octave/Makefile") CONFIG_FILES="$CONFIG_FILES src/octave/Makefile" ;;
+    "src2/core/Makefile") CONFIG_FILES="$CONFIG_FILES src2/core/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "gui/apps/rappture") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture" ;;

trunk/configure.in

@@ -59 +59 @@
     MEX_ARCH="-arch=$with_matlab_arch"
 fi
-dnl AC_CHECK_PROG(MEX, mex, mex, false)
 dnl AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x)
 
@@ -209 +208 @@
             src/matlab/Makefile \
             src/octave/Makefile \
+            src2/core/Makefile \
             test/Makefile \
             gui/apps/rappture   )