[cig-commits] r9287 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-02-13 01:51:05 -0800 (Wed, 13 Feb 2008)
New Revision: 9287

Modified:
   cs/benchmark/cigma/trunk/src/Makefile.am
Log:
Fixed Makefile.am issues with libcigma.a

Modified: cs/benchmark/cigma/trunk/src/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-13 09:51:02 UTC (rev 9286)
+++ cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-13 09:51:05 UTC (rev 9287)
@@ -1,19 +1,26 @@
 bin_PROGRAMS = cigma
 
-noinst_LIBRARIES = libh5io.a libann.a
+noinst_LIBRARIES = libh5io.a libann.a libcigma.a
 
-cigma_LDADD = libh5io.a libann.a $(HDF5_LIBS) $(HDF5_LDFLAGS) -L$(srcdir) $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
-cigma_CPPFLAGS = -Wno-deprecated $(HDF5_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) -I$(srcdir)/h5io -I$(srcdir)/ann/include
+libh5io_a_CPPFLAGS = $(HDF5_INCLUDES)
 
-libh5io_a_CPPFLAGS = $(HDF5_INCLUDES)
 libann_a_CPPFLAGS = -I$(srcdir)/ann/include
-#libcigma_a_CPPFLAGS = -Wno-deprecated $(HDF5_INCLUDES) -I$(srcdir)/ann/include
 
+libcigma_a_CPPFLAGS = -Wno-deprecated $(HDF5_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) -I$(srcdir)/h5io -I$(srcdir)/ann/include
+#libcigma_a_LIBADD = libh5io.a libann.a
+
+cigma_CPPFLAGS = -Wno-deprecated $(HDF5_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) -I$(srcdir)/h5io -I$(srcdir)/ann/include
+cigma_LDFLAGS = -I$(srcdir)/h5io -I$(srcdir)/ann/include
+cigma_LDADD = $(HDF5_LIBS) $(HDF5_LDFLAGS) -L$(srcdir) $(PYTHON_LDFLAGS) $(PYTHON_LIBS) libcigma.a libh5io.a libann.a
+
 #vtkls_SOURCES = vtkls.cpp
 
 
 ##############################################################################
 
+cigma_SOURCES = \
+	cigma.cpp
+
 libh5io_a_SOURCES = \
 	h5io/h5array.c \
 	h5io/h5attr.c \
@@ -52,8 +59,7 @@
 	ann/src/pr_queue.h \
 	ann/src/pr_queue_k.h
 
-cigma_SOURCES = \
-	cigma.cpp \
+libcigma_a_SOURCES = \
 	AnnLocator.cpp \
 	AnnLocator.h \
 	AnyOption.cpp \