From cd22b752de6b0e2529c966e0192f0d2e69fa1786 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jun 06 2008 18:48:35 +0000 Subject: Fix Makefile.am hunks. --- diff --git a/openbabel-python-ppc64.patch b/openbabel-python-ppc64.patch index a3e4d5c..6c0f8a7 100644 --- a/openbabel-python-ppc64.patch +++ b/openbabel-python-ppc64.patch @@ -237,9 +237,9 @@ Index: scripts/Makefile.am if MAINTAINER_MODE if BUILD_SWIG -BUILT_SOURCES = perl/openbabel_perl.cpp python/openbabel_python.cpp \ -- java/openbabel_java.cpp csharp/openbabel_csharp.cpp +- java/openbabel_java.cpp +BUILT_SOURCES = perl/openbabel_perl.cpp \ -+ java/openbabel_java.cpp csharp/openbabel_csharp.cpp \ ++ java/openbabel_java.cpp \ + python/obcore.cpp python/obconversion.cpp python/obtemplate.cpp script_includes = $(top_srcdir)/include/openbabel @@ -249,8 +249,9 @@ Index: scripts/Makefile.am mv perl/OpenBabel.new perl/OpenBabel.pm; -python/openbabel_python.cpp: openbabel-python.i $(script_headers) +- $(SWIG) -python -modern -naturalvar -fastinit \ +python/obconversion.cpp: openbabel-python2.i $(script_headers) - $(SWIG) -small -O -python -templatereduce -naturalvar \ ++ $(SWIG) -small -O -python -templatereduce -naturalvar \ -c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<; - echo "import sys" >python/ob.py; - echo "if sys.platform.find(\"linux\") != -1:" >>python/ob.py; @@ -272,8 +273,8 @@ Index: scripts/Makefile.am + -c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<; + java/openbabel_java.cpp: openbabel-java.i $(script_headers) - $(SWIG) -small -O -java -naturalvar -templatereduce -c++ -o $@ \ - -I$(top_srcdir)/include -I$(top_builddir)/include $<; + $(SWIG) -java -naturalvar -c++ -o $@ -I$(top_srcdir)/include \ + -I$(top_builddir)/include $<; Index: scripts/openbabel-python.i =================================================================== --- scripts/openbabel-python.i (revision 2534)