[cig-commits] r15014 - cs/nemesis/trunk

[leif at geodynamics.org]

Author: leif
Date: 2009-05-18 16:17:46 -0700 (Mon, 18 May 2009)
New Revision: 15014

Modified:
   cs/nemesis/trunk/Makefile.am
   cs/nemesis/trunk/configure.ac
Log:
Use the new CIT_PYTHON_CONFIG instead of CIT_PYTHON_SYSCONFIG.  See
Issue39.


Modified: cs/nemesis/trunk/Makefile.am
===================================================================
--- cs/nemesis/trunk/Makefile.am	2009-05-18 23:16:17 UTC (rev 15013)
+++ cs/nemesis/trunk/Makefile.am	2009-05-18 23:17:46 UTC (rev 15014)
@@ -4,38 +4,17 @@
 
 bin_PROGRAMS = nemesis mpinemesis
 
-INCLUDES = \
-	$(PYTHON_EGG_CPPFLAGS) \
-	-I$(PYTHON_INCDIR)
+AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) $(PYTHON_CPPFLAGS)
+AM_LDFLAGS = $(PYTHON_LDFLAGS)
+LIBS = $(PYTHON_LIBS)
 
-
 # nemesis (links MPI, but does not initialize it)
 nemesis_SOURCES = nemesis.c
-nemesis$(EXEEXT): $(nemesis_OBJECTS) $(nemesis_DEPENDENCIES) 
-	@rm -f nemesis$(EXEEXT)
-	$(LINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
-		$(nemesis_LDFLAGS) $(nemesis_OBJECTS) $(nemesis_LDADD) \
-		$(PYTHON_EGG_LDFLAGS) \
-		$(PYTHON_BLDLIBRARY) \
-		$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
-		$(LIBS) \
-		$(PYTHON_LDLAST)
 
-
 # mpinemesis (initializes MPI before starting Python)
 mpinemesis_SOURCES = nemesis.c
 mpinemesis_CFLAGS = -DUSE_MPI
-mpinemesis$(EXEEXT): $(mpinemesis_OBJECTS) $(mpinemesis_DEPENDENCIES) 
-	@rm -f mpinemesis$(EXEEXT)
-	$(LINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
-		$(mpinemesis_LDFLAGS) $(mpinemesis_OBJECTS) $(mpinemesis_LDADD) \
-		$(PYTHON_EGG_LDFLAGS) \
-		$(PYTHON_BLDLIBRARY) \
-		$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
-		$(LIBS) \
-		$(PYTHON_LDLAST)
 
-
 install-data-hook:
 	top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
 		cd $(top_srcdir) && \

Modified: cs/nemesis/trunk/configure.ac
===================================================================
--- cs/nemesis/trunk/configure.ac	2009-05-18 23:16:17 UTC (rev 15013)
+++ cs/nemesis/trunk/configure.ac	2009-05-18 23:17:46 UTC (rev 15014)
@@ -18,7 +18,7 @@
 
 # Check for Python.
 AM_PATH_PYTHON([2.3])
-CIT_PYTHON_SYSCONFIG
+CIT_PYTHON_CONFIG
 
 # Check for Python modules and packages.
 CIT_PYTHON_EGG_SETUP