stop including otk in the openbox module. makes the wm hooger for no good cause....

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index d2825c9b7e2ac088216694dd6ab61d829c23af35..332d09f912450985bcc86218842e538808b53db8 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,4 +1,6 @@
-CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@
+scriptdir = $(libdir)/openbox/python
+
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@
 
 INCLUDES= -I../src
 
@@ -15,19 +17,23 @@ libotk_la_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
 
 libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS)
 
+script_DATA = otk.py
+
+EXTRA_DIST = $(script_DATA)
+
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
        rm -f *\~ *.orig *.rej .\#*
 
 otk_test: libotk.a otk_test.cc
-       $(CXX) $(CPPFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
+       $(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
 
 otk.i: $(wildcard *.hh)
        touch $@
 
 otk_wrap.cc: otk.i
-       swig -python -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \