From: Alan W. I. <ai...@us...> - 2004-07-14 01:20:16
|
Update of /cvsroot/plplot/plplot/bindings/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5061/bindings/python Modified Files: Makefile.am Log Message: Brute force changes to make separated build tree work. Note, octave doesn't work, and there is a small issue with pltclgen accessing buildtree files rather than source tree files, but otherwise the separated build works with these changes. N.B. No further testing done yet (such as make check, make install). Index: Makefile.am =================================================================== RCS file: /cvsroot/plplot/plplot/bindings/python/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile.am 30 Jun 2004 17:11:06 -0000 1.35 +++ Makefile.am 14 Jul 2004 01:20:06 -0000 1.36 @@ -26,8 +26,10 @@ SWIG_SUPPORT_DIR = $(top_srcdir)/bindings/swig-support PLPLOTCAPI_I = $(SWIG_SUPPORT_DIR)/plplotcapi.i +SWIG_PYTHON_DIR = $(top_srcdir)/bindings/python +MAKEDOCSTRINGS_PY = $(SWIG_PYTHON_DIR)/makedocstrings.py -SWIG_CMD = $(SWIG) -I$(SWIG_SUPPORT_DIR) -c++ -DSWIG_PYTHON -python +SWIG_CMD = $(SWIG) -I$(SWIG_SUPPORT_DIR) -I$(SWIG_PYTHON_DIR) -c++ -DSWIG_PYTHON -python ### FIXME: Brute force inclusion in dist tarball. The files below may ### be treated in a different way for installation [RL, 2003-03-06] @@ -56,16 +58,16 @@ # swig-1.3.21+ does not handle documentation strings properly so run this # script to make documentation strings. -plplotcmodule_double.c: plplotcmodule_p_double.c makedocstrings.py - $(PYTHON) makedocstrings.py plplotcmodule_p_double.c plplotcmodule_double.c +plplotcmodule_double.c: plplotcmodule_p_double.c $(MAKEDOCSTRINGS_PY) + $(PYTHON) $(MAKEDOCSTRINGS_PY) plplotcmodule_p_double.c plplotcmodule_double.c ### Note plplotc.py generated here as well, but it is identical to the ### one generated above and we cannot mention it as a duplicate target here. plplotcmodule_p_single.c: plplotcmodule.i $(PLPLOTCAPI_I) $(SWIG_CMD) -o plplotcmodule_p_single.c plplotcmodule.i -plplotcmodule_single.c: plplotcmodule_p_single.c makedocstrings.py - $(PYTHON) makedocstrings.py plplotcmodule_p_single.c plplotcmodule_single.c +plplotcmodule_single.c: plplotcmodule_p_single.c $(MAKEDOCSTRINGS_PY) + $(PYTHON) $(MAKEDOCSTRINGS_PY) plplotcmodule_p_single.c plplotcmodule_single.c # Must have "exec" in the name. ourexecpythondir = $(pythondir) @@ -74,7 +76,7 @@ # NUMERICINCCMD only required until we quit supporting python 1.5 # X_CFLAGS required (on some platforms, e.g., netbsd) by plplot_widgetmodule.c -AM_CPPFLAGS = $(INCLTDL) $(PYTHONINCCMD) $(NUMERICINCCMD) $(X_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include $(INCLTDL) $(PYTHONINCCMD) $(NUMERICINCCMD) $(X_CFLAGS) # For Mac OS X/fink we have found that dropping -no-undefined $(PYTHON_LDFLAGS) # solves an unknown linking problem that causes python to be unable to import @@ -114,7 +116,7 @@ ourexecpython_LTLIBRARIES = UNDERSCORE_plplotcmodule.la plplot_widgetmodule.la ### Do a similar job as install-exec-hook in the .libs directory, but -### also removing "module" from teh file names. This regards make +### also removing "module" from the file names. This regards make ### check. check_DATA = .libs/check-stamp |