dont make wrap a subdir of otk

diff --git a/Makefile.am b/Makefile.am
index 2c96933dff9141ea6061a95e4df8af9054524517..e6c9a7a62ba26a50b28a66486229e3b8a8470ba1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po data doc otk src scripts
+SUBDIRS = po data doc otk wrap src scripts
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 
 .PHONY: doc

diff --git a/configure.ac b/configure.ac
index 9d58ce20bfaf000561ce605ba0ebaf75c0206686..9e7d9bfcbfa8fa86082bf078c53d8818b60d684a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,8 +48,8 @@ X11_EXT_XINERAMA
 
 AC_CONFIG_FILES([Makefile po/Makefile.in
                otk/Makefile
-               otk/wrap/Makefile
                src/Makefile
+               wrap/Makefile
                scripts/Makefile
                doc/Makefile
                doc/doxygen/Makefile

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 31eb4a76c74c0ad74aa6d93900d03ab7ba9466d0..feeda74146a4b24dbfb4e0edde9671009ac065b3 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = wrap
-
 buttonsdir = $(pkgdatadir)/buttons
 includeotkdir = $(includedir)/otk
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/otk/wrap/.cvsignore b/wrap/.cvsignore
similarity index 100%
rename from otk/wrap/.cvsignore
rename to wrap/.cvsignore

diff --git a/otk/wrap/Makefile.am b/wrap/Makefile.am
similarity index 84%
rename from otk/wrap/Makefile.am
rename to wrap/Makefile.am
index 4c2de002d6589111d4ccb6bfec8d3f7de25ea0e1..7c8e603a84c1e048cf5deef884b9bd4290c5d37a 100644 (file)
--- a/otk/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -3,14 +3,14 @@ pythondir = $(libdir)/openbox/python
 
 CXXFLAGS = $(XFT_CFLAGS) $(filter-out -W -Wall,@CXXFLAGS@)
 
-INCLUDES = -I.. -I../..
+INCLUDES = -I.. -I../swig
 
 python_LTLIBRARIES = otkpy.la
 
 otkpy_la_CXXFLAGS = $(PYTHON_CFLAGS)
 otkpy_la_LDFLAGS  = -module
 otkpy_la_SOURCES  = wrap_otk.cc
-otkpy_la_LIBADD   = ../libotk.la
+otkpy_la_LIBADD   = ../otk/libotk.la
 
 CLEANFILES = wrap_* otk.py
 MAINTAINERCLEANFILES = Makefile.in
@@ -27,6 +27,9 @@ uninstall-local:
 
 %.py: wrap_%.cc
 
-wrap_%.cc: %.i $(wildcard ../*.hh)
+otk.i: $(wildcard ../otk/*.hh)
+       @touch $@
+
+wrap_%.cc: %.i
        swig $(INCLUDES) $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 

diff --git a/otk/wrap/otk.i b/wrap/otk.i
similarity index 100%
rename from otk/wrap/otk.i
rename to wrap/otk.i

diff --git a/otk/wrap/ustring.i b/wrap/ustring.i
similarity index 100%
rename from otk/wrap/ustring.i
rename to wrap/ustring.i