[cig-commits] r9227 - in cs/benchmark/cigma/trunk: . src

[luis at geodynamics.org]

Author: luis
Date: 2008-02-04 17:14:02 -0800 (Mon, 04 Feb 2008)
New Revision: 9227

Modified:
   cs/benchmark/cigma/trunk/configure.ac
   cs/benchmark/cigma/trunk/src/AnnLocator.cpp
   cs/benchmark/cigma/trunk/src/AnnLocator.h
   cs/benchmark/cigma/trunk/src/Makefile.am
Log:
More work on src/Makefile.am
 * Libraries libh5io.a and libann.a now build fine
 * Temporarily removed libcigma.a


Modified: cs/benchmark/cigma/trunk/configure.ac
===================================================================
--- cs/benchmark/cigma/trunk/configure.ac	2008-02-05 00:22:18 UTC (rev 9226)
+++ cs/benchmark/cigma/trunk/configure.ac	2008-02-05 01:14:02 UTC (rev 9227)
@@ -19,36 +19,37 @@
 dnl Check for default compilers
 AC_PROG_CC
 AC_PROG_CXX
-if test "x${CC}" = "x" -o "x${CXX}" = "x"; then
-    AC_MSG_ERROR([Could not find required compilers, aborting.])
-fi
-LINKER="${CXX}"
+#if test "x${CC}" = "x" -o "x${CXX}" = "x"; then
+#    AC_MSG_ERROR([Could not find required compilers, aborting.])
+#fi
+#LINKER="${CXX}"
 
 dnl Use C++ for all compilation tests
 AC_LANG(C++)
 
 dnl Set default flags
-FLAGS="-Wall"
-OPTIM="-g -O2"
+#FLAGS="-Wall"
+#OPTIM="-g -O2"
 
 dnl Check for various programs
 AC_PROG_CPP
 
 dnl How to build static libraries?
-case "$UNAME" in
-  Darwin*)
-    AR="libtool -o"
-    RANLIB=true
-    ;;
-  *)
-    AC_PROG_RANLIB
-    AC_PATH_PROG(AR, ar)
-    if test "x${AR}" = "x"; then
-        AC_MSG_ERROR([Could not find the library archiver, aborting.])
-    fi
-    AR="${AR} ruvs"
-    ;;
-esac
+AC_PROG_RANLIB
+#case "$UNAME" in
+#  Darwin*)
+#    AR="libtool -o"
+#    RANLIB=true
+#    ;;
+#  *)
+#    AC_PROG_RANLIB
+#    AC_PATH_PROG(AR, ar)
+#    if test "x${AR}" = "x"; then
+#        AC_MSG_ERROR([Could not find the library archiver, aborting.])
+#    fi
+#    AR="${AR} ruvs"
+#    ;;
+#esac
 
 dnl See if we need a .exe extension on executables
 AC_EXEEXT
@@ -71,13 +72,14 @@
 
 
 dnl Write output
-AC_SUBST(UNAME)
-AC_SUBST(FLAGS)
-AC_SUBST(OPTIM)
-AC_SUBST(LINKER)
+
+#AC_SUBST(UNAME)
+#AC_SUBST(FLAGS)
+#AC_SUBST(OPTIM)
+#AC_SUBST(LINKER)
 AC_SUBST(CIGMA_DIRS)
 AC_SUBST(CIGMA_LIBS)
-AC_SUBST(AR)
+#AC_SUBST(AR)
 
 AC_SUBST(VTK_INCLUDES)
 AC_SUBST(VTK_LIBS)
@@ -92,7 +94,6 @@
 AC_SUBST(PYTHON_LDFLAGS)
 
 AC_CONFIG_FILES([Makefile
-                 variables
                  src/Makefile
                  ])
 

Modified: cs/benchmark/cigma/trunk/src/AnnLocator.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/AnnLocator.cpp	2008-02-05 00:22:18 UTC (rev 9226)
+++ cs/benchmark/cigma/trunk/src/AnnLocator.cpp	2008-02-05 01:14:02 UTC (rev 9227)
@@ -1,6 +1,5 @@
 #include <cassert>
 #include "AnnLocator.h"
-#include "MeshPart.h"
 
 
 // ---------------------------------------------------------------------------

Modified: cs/benchmark/cigma/trunk/src/AnnLocator.h
===================================================================
--- cs/benchmark/cigma/trunk/src/AnnLocator.h	2008-02-05 00:22:18 UTC (rev 9226)
+++ cs/benchmark/cigma/trunk/src/AnnLocator.h	2008-02-05 01:14:02 UTC (rev 9227)
@@ -3,6 +3,7 @@
 
 #include "ANN/ANN.h"
 #include "Locator.h"
+#include "MeshPart.h"
 
 
 namespace cigma
@@ -11,7 +12,6 @@
 }
 
 
-
 class cigma::AnnLocator : public cigma::Locator
 {
 public:

Modified: cs/benchmark/cigma/trunk/src/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-05 00:22:18 UTC (rev 9226)
+++ cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-05 01:14:02 UTC (rev 9227)
@@ -1,17 +1,19 @@
-bin_PROGRAMS = cigma vtkls
+bin_PROGRAMS = cigma
 
-noinst_LIBRARIES = libh5io.a libann.a libcigma.a
+noinst_LIBRARIES = libh5io.a libann.a
 
-cigma_SOURCES = cigma.cpp
-cigma_LDADD = libcigma.a libh5io.a libann.a -lhdf5
-cigma_CPPFLAGS = -I$(srcdir)/h5io -I$(srcdir)/ann/include
+cigma_LDADD = libh5io.a libann.a $(HDF5_LIBS) $(HDF5_LDFLAGS) -L$(srcdir)
+cigma_CPPFLAGS = -Wno-deprecated $(HDF5_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) -I$(srcdir)/h5io -I$(srcdir)/ann/include
 
-vtkls_SOURCES = vtkls.cpp
+libh5io_a_CPPFLAGS = $(HDF5_INCLUDES)
+libann_a_CPPFLAGS = -I$(srcdir)/ann/include
+#libcigma_a_CPPFLAGS = -Wno-deprecated $(HDF5_INCLUDES) -I$(srcdir)/ann/include
 
+#vtkls_SOURCES = vtkls.cpp
 
+
 ##############################################################################
 
-
 libh5io_a_SOURCES = \
 	h5io/h5array.c \
 	h5io/h5attr.c \
@@ -50,7 +52,8 @@
 	ann/src/pr_queue.h \
 	ann/src/pr_queue_k.h
 
-libcigma_a_SOURCES = \
+cigma_SOURCES = \
+	cigma.cpp \
 	AnnLocator.cpp \
 	AnnLocator.h \
 	AnyOption.cpp \