add an unregister_all for python callbacks

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ea811f0ac949863e9e48561fdd6dc59c3bc0824..e406de3f5b98ef439bc7ca26b6c36c5afde74c70 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\" \
@@ -30,6 +30,6 @@ openbox.i: openbox.hh screen.hh client.hh
        touch $@
 
 openbox_wrap.cc: openbox.i
-       swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CXXFLAGS)) -python -c++ -nodefault -o $@ $<
 
 # local dependencies