conflicts with python too :\

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index beb05a69fbdf4360188fed8226378b975e4d9c80..e406de3f5b98ef439bc7ca26b6c36c5afde74c70 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,13 @@
 localedir=$(datadir)/locale
+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)\"
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
 LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
@@ -17,8 +19,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 +30,6 @@ openbox.i: openbox.hh screen.hh client.hh
        touch $@
 
 openbox_wrap.cc: openbox.i
-       swig -python -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CXXFLAGS)) -python -c++ -nodefault -o $@ $<
 
 # local dependencies