dont make wrap a subdir of otk
Dana Jansens danakj@orodu.net
7 files changed,
8 insertions(+),
7 deletions(-)
M
Makefile.am
→
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
M
configure.ac
→
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
M
otk/Makefile.am
→
otk/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = wrap - buttonsdir = $(pkgdatadir)/buttons includeotkdir = $(includedir)/otk pkgconfigdir = $(libdir)/pkgconfig
M
otk/wrap/Makefile.am
→
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 @@ rm -f "$(DESTDIR)$(pythondir)/_otk.so"
%.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 $@ $<