X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=0ba90ade1d5b5dfed78aca931cfe711e3367c8a5;hb=a2de94e91e1c0e7775c97745ae11d14e5c5f5659;hp=d2825c9b7e2ac088216694dd6ab61d829c23af35;hpb=bf49e7642027f576716e5742544c282f4396f9ef;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index d2825c9b..0ba90ade 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,4 +1,4 @@
-CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@
 
 INCLUDES= -I../src
 
@@ -21,13 +21,13 @@ 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 \