From: Dana Jansens <danakj@orodu.net>
Date: Wed, 5 Feb 2003 10:48:37 +0000 (+0000)
Subject: dont make wrap a subdir of otk
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=67fbe8354f27386235e0c8dc57bd036e34a4fe5e;p=chaz%2Fopenbox

dont make wrap a subdir of otk
---

diff --git a/Makefile.am b/Makefile.am
index 2c96933d..e6c9a7a6 100644
--- 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 9d58ce20..9e7d9bfc 100644
--- 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 31eb4a76..feeda741 100644
--- 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 4c2de002..7c8e603a 100644
--- 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