[MOAB-dev] r3036 - in MOAB/trunk: . tools/iMesh/python

[jvporter at mcs.anl.gov]

Author: jvporter
Date: 2009-07-21 13:32:30 -0500 (Tue, 21 Jul 2009)
New Revision: 3036

Removed:
   MOAB/trunk/tools/iMesh/python/setup.cfg.in
Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/tools/iMesh/python/Makefile.am
Log:
Improve autotools integration for Python libraries
* "install" actually works
* "clean" works
* More useful options to install, thanks to Jason


Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2009-07-21 18:04:12 UTC (rev 3035)
+++ MOAB/trunk/configure.ac	2009-07-21 18:32:30 UTC (rev 3036)
@@ -1067,7 +1067,6 @@
                  tools/iMesh/SIDL/Makefile
                  tools/iMesh/SIDL/common.make
                  tools/iMesh/python/Makefile
-                 tools/iMesh/python/setup.cfg
                  tools/mbperf/Makefile
                  tools/mbchaco/Makefile
                  tools/mbcoupler/Makefile

Modified: MOAB/trunk/tools/iMesh/python/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/python/Makefile.am	2009-07-21 18:04:12 UTC (rev 3035)
+++ MOAB/trunk/tools/iMesh/python/Makefile.am	2009-07-21 18:32:30 UTC (rev 3036)
@@ -1,5 +1,21 @@
+BUILD_EXT_FLAGS = --include-dirs="$(PYTHON_DIR):$(NUMPY_DIR):$(abs_top_srcdir)"\
+                  --imesh-dir="$(abs_srcdir)/.."
+
+INSTALL_FLAGS = --skip-build \
+                --prefix="$(prefix)" \
+                --exec-prefix="$(exec_prefix)" \
+                --root="$(DESTDIR)" \
+                --install-lib="$(libdir)" \
+                --install-headers="$(incluedir)" \
+                --install-data="$(datadir)" \
+                --install-scripts="$(bindir)"
+
 all:
+	python setup.py build_ext $(BUILD_EXT_FLAGS)
 	python setup.py build
 
-install-exec:
-	python setup.py install
\ No newline at end of file
+install:
+	python setup.py install $(INSTALL_FLAGS)
+
+clean:
+	python setup.py clean --all

Deleted: MOAB/trunk/tools/iMesh/python/setup.cfg.in
===================================================================
--- MOAB/trunk/tools/iMesh/python/setup.cfg.in	2009-07-21 18:04:12 UTC (rev 3035)
+++ MOAB/trunk/tools/iMesh/python/setup.cfg.in	2009-07-21 18:32:30 UTC (rev 3036)
@@ -1,5 +0,0 @@
-[build_ext]
-imesh-dir = @abs_srcdir@/..
-include-dirs = @PYTHON_DIR@:@NUMPY_DIR@:@abs_top_srcdir@
-[install]
-install-base = @prefix@