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

[luis at geodynamics.org]

Author: luis
Date: 2008-02-04 14:19:37 -0800 (Mon, 04 Feb 2008)
New Revision: 9218

Modified:
   cs/benchmark/cigma/trunk/Makefile.am
   cs/benchmark/cigma/trunk/configure.ac
   cs/benchmark/cigma/trunk/src/Makefile.am
Log:
Fixes to autoconf build
 * Added src/ directory to SUBDIRS in top level Makefile.am
 * Added src/Makefile to configure.ac AC_OUTPUT macro
 * Fixed autoconf warnings from src/Makefile.am

Modified: cs/benchmark/cigma/trunk/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/Makefile.am	2008-02-04 22:19:34 UTC (rev 9217)
+++ cs/benchmark/cigma/trunk/Makefile.am	2008-02-04 22:19:37 UTC (rev 9218)
@@ -1 +1,3 @@
 ACLOCAL_AMFLAGS = -I ./m4
+
+SUBDIRS=src

Modified: cs/benchmark/cigma/trunk/configure.ac
===================================================================
--- cs/benchmark/cigma/trunk/configure.ac	2008-02-04 22:19:34 UTC (rev 9217)
+++ cs/benchmark/cigma/trunk/configure.ac	2008-02-04 22:19:37 UTC (rev 9218)
@@ -91,7 +91,10 @@
 AC_SUBST(PYTHON_LIBS)
 AC_SUBST(PYTHON_LDFLAGS)
 
-AC_CONFIG_FILES([Makefile variables])
+AC_CONFIG_FILES([Makefile
+                 variables
+                 src/Makefile
+                 ])
 
 AC_OUTPUT
 

Modified: cs/benchmark/cigma/trunk/src/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-04 22:19:34 UTC (rev 9217)
+++ cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-04 22:19:37 UTC (rev 9218)
@@ -1,8 +1,10 @@
-include ../build/variables
+include ../variables
 
-FLAGS = -Wall -Wno-deprecated
+#FLAGS = -Wall -Wno-deprecated
+FLAGS += -Wno-deprecated
 FLAGS += -g
 
+INCLUDES  =
 INCLUDES += $(PYTHON_INCLUDES)
 INCLUDES += $(VTK_INCLUDES)
 INCLUDES += $(HDF5_INCLUDES)
@@ -57,7 +59,7 @@
 	CubeCmd.o \
 	Misc.o \
 	Locator.o \
-	AnnLocator.o \
+	AnnLocator.o
 
 
 default: libann libh5io testlib cigma vtkls tests