diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-02-05 10:48:37 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-02-05 10:48:37 +0000 |
| commit | 67fbe8354f27386235e0c8dc57bd036e34a4fe5e (patch) | |
| tree | 607f56f0b6284db691a2efeeffb8676f26f909fb | |
| parent | 7d94983b2e0c55e9d6fa9bc39c102c5b8b8dd468 (diff) | |
dont make wrap a subdir of otk
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | otk/Makefile.am | 2 | ||||
| -rw-r--r-- | wrap/.cvsignore (renamed from otk/wrap/.cvsignore) | 0 | ||||
| -rw-r--r-- | wrap/Makefile.am (renamed from otk/wrap/Makefile.am) | 9 | ||||
| -rw-r--r-- | wrap/otk.i (renamed from otk/wrap/otk.i) | 0 | ||||
| -rw-r--r-- | wrap/ustring.i (renamed from otk/wrap/ustring.i) | 0 |
7 files changed, 8 insertions, 7 deletions
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 index 63aba835..63aba835 100644 --- a/otk/wrap/.cvsignore +++ b/wrap/.cvsignore diff --git a/otk/wrap/Makefile.am b/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 index 5bf17a21..5bf17a21 100644 --- a/otk/wrap/otk.i +++ b/wrap/otk.i diff --git a/otk/wrap/ustring.i b/wrap/ustring.i index d693e7dc..d693e7dc 100644 --- a/otk/wrap/ustring.i +++ b/wrap/ustring.i |