From 525cc0169601dc726d623fa2baf3a4e21d0c6936 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Thu, 31 Jul 2003 12:20:49 +0000
Subject: [PATCH] * wrap/Makefile.am, wrap/spot.i: Move ... *
 wrap/python/Makefile.am, wrap/python/spot.i: ... here. * wrap/Makefile.am:
 New file. * configure.ac: Output wrap/python/Makefile.

---
 ChangeLog                |  5 +++++
 configure.ac             |  1 +
 wrap/.cvsignore          |  7 -------
 wrap/Makefile.am         | 19 +------------------
 wrap/python/.cvsignore   |  9 +++++++++
 wrap/python/Makefile.am  | 18 ++++++++++++++++++
 wrap/{ => python}/spot.i |  0
 7 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 wrap/python/.cvsignore
 create mode 100644 wrap/python/Makefile.am
 rename wrap/{ => python}/spot.i (100%)

diff --git a/ChangeLog b/ChangeLog
index 27e04e320..10a0ffb0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-31  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* wrap/Makefile.am, wrap/spot.i: Move ...
+	* wrap/python/Makefile.am, wrap/python/spot.i: ... here.
+	* wrap/Makefile.am: New file.
+	* configure.ac: Output wrap/python/Makefile.
+
 	* src/misc/const_sel.hh: Delete.
 	* src/misc/Makefile.am (misc_HEADERS): Remove const_sel.hh.
 
diff --git a/configure.ac b/configure.ac
index 3804391af..db4869a8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,5 +43,6 @@ AC_CONFIG_FILES([
   src/tgbatest/defs
   src/misc/Makefile
   wrap/Makefile
+  wrap/python/Makefile
 ])
 AC_OUTPUT
diff --git a/wrap/.cvsignore b/wrap/.cvsignore
index 50dd12bdb..282522db0 100644
--- a/wrap/.cvsignore
+++ b/wrap/.cvsignore
@@ -1,9 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-*.la
-spot.py*
-*.lo
-*.loT
-spot_wrap.cxx
diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index 5cb6f2c03..96fcb3e25 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -1,18 +1 @@
-
-AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src
-
-python_PYTHON = spot.py
-pyexec_LTLIBRARIES = _spot.la
-
-_spot_la_SOURCES = spot_wrap.cxx
-_spot_la_LDFLAGS = -avoid-version -module 
-_spot_la_LIBADD = ../src/libspot.la
-
-EXTRA_DIST = spot.i
-spot_wrap.cxx: spot.i
-	swig -c++ -python -I$(top_srcdir)/src spot.i
-
-spot.py: spot.i
-	$(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx
-
-MAINTAINERCLEANFILES = spot_wrap.cxx spot.py
+SUBDIRS = python
diff --git a/wrap/python/.cvsignore b/wrap/python/.cvsignore
new file mode 100644
index 000000000..50dd12bdb
--- /dev/null
+++ b/wrap/python/.cvsignore
@@ -0,0 +1,9 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+spot.py*
+*.lo
+*.loT
+spot_wrap.cxx
diff --git a/wrap/python/Makefile.am b/wrap/python/Makefile.am
new file mode 100644
index 000000000..a95cd0444
--- /dev/null
+++ b/wrap/python/Makefile.am
@@ -0,0 +1,18 @@
+
+AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src
+
+python_PYTHON = spot.py
+pyexec_LTLIBRARIES = _spot.la
+
+_spot_la_SOURCES = spot_wrap.cxx
+_spot_la_LDFLAGS = -avoid-version -module
+_spot_la_LIBADD = $(top_builddir)/src/libspot.la
+
+EXTRA_DIST = spot.i
+spot_wrap.cxx: spot.i
+	swig -c++ -python -I$(top_srcdir)/src spot.i
+
+spot.py: spot.i
+	$(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx
+
+MAINTAINERCLEANFILES = spot_wrap.cxx spot.py
diff --git a/wrap/spot.i b/wrap/python/spot.i
similarity index 100%
rename from wrap/spot.i
rename to wrap/python/spot.i