[cig-commits] r13251 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2008-11-04 01:49:01 -0800 (Tue, 04 Nov 2008)
New Revision: 13251

Modified:
   cs/cigma/trunk/Makefile.am
Log:
Updated Makefile.am

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-11-04 09:48:59 UTC (rev 13250)
+++ cs/cigma/trunk/Makefile.am	2008-11-04 09:49:01 UTC (rev 13251)
@@ -217,11 +217,10 @@
 ###############################################################################
 # Python module
 
+##lib_LTLIBRARIES += libcigma.la
+##libpycigma_la_SOURCES = foo.cpp
+##libpycigma_la_CPPFLAGS = $(libcigma_a_CPPFLAGS) $(PYTHON_INCLUDE_DIR)
 
-#lib_LTLIBRARIES += libcigma.la
-#libpycigma_la_SOURCES = foo.cpp
-#libpycigma_la_CPPFLAGS = $(libcigma_a_CPPFLAGS) $(PYTHON_INCLUDE_DIR)
-
 pyexec_PROGRAMS = _cigma.so
 
 # _cigma.so extension {{{
@@ -237,6 +236,7 @@
 	ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
 	$(PYTHON_BIN) src/py_cigma_setup.py build --build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/pybuild -f)
 
+
 _cigma_so_CXXFLAGS =
 _cigma_so_CXXFLAGS += -I$(top_srcdir)/src
 
@@ -244,7 +244,6 @@
 _cigma_so_LDADD += libcigma.a
 _cigma_so_LDADD += libann.a
 
-# XXX: add header files to this variable
 _cigma_so_SOURCES = \
 	src/numpy_util.h \
 	src/numpy_util.cpp \
@@ -286,7 +285,12 @@
 	src/py_Misc.cpp \
 	src/py_cigma_module.cpp
 
+#_cigma.so: $(_cigma_so_OBJS) 
+#	g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -L/home/luis/cigma/.libs -I./src -Wno-deprecated -DETLOG -I./src/contrib/ann/include -I/usr/include/python2.5 -g -O2 $^ libcigma.a libann.a -lboost_filesystem -lboost_python -o $@
 
+#py_%.o: src/py_%.cpp
+#	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -I./src -Wno-deprecated -DETLOG -I./src/contrib/ann/include -I/usr/include/python2.5 -g -O2 -fPIC -DPYTHON_MODULE=1 -I/usr/include/python2.5 -c $< -o ./$@
+
 EXTRA_DIST += src/py_cigma_setup.py
 
 # }}}