use the -I's in CFLAGS for swig

diff --git a/otk/Makefile.am b/otk/Makefile.am
index d2825c9b7e2ac088216694dd6ab61d829c23af35..2ca5f35a46970ed80212c0f127adbd405d4e7e0b 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -27,7 +27,7 @@ otk.i: $(wildcard *.hh)
        touch $@
 
 otk_wrap.cc: otk.i
-       swig -python -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \

diff --git a/src/Makefile.am b/src/Makefile.am
index beb05a69fbdf4360188fed8226378b975e4d9c80..222b770c187a23bb4b762810ca21c0d3070d5bc5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,7 @@ openbox3_LDADD=-L../otk -lotk @LIBINTL@
 
 openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
                   main.cc rootwindow.cc backgroundwidget.cc labelwidget.cc \
-                  buttonwidget.cc openbox_wrap.cc
-# guile.cc
+                  buttonwidget.cc python.cc openbox_wrap.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
@@ -29,6 +28,6 @@ openbox.i: openbox.hh screen.hh client.hh
        touch $@
 
 openbox_wrap.cc: openbox.i
-       swig -python -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
 
 # local dependencies