state_above/below work now

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index fc28a36a4cdb1cf874ebf3651293acb987912bbe..0ba90ade1d5b5dfed78aca931cfe711e3367c8a5 100644 (file)
--- 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 $(filter -I%,$(CFLAGS)) -python -c++ -o $@ $<
+       swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \