X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=a8995148e8d5be8a3068c332eab004a6d457916c;hb=3661e55fba3b5f3be246b3f65d650460282018ac;hp=222b770c187a23bb4b762810ca21c0d3070d5bc5;hpb=f9107b5c5a4cc03bf544854e8d6d1ba83f6cd979;p=chaz%2Fopenbox diff --git a/src/Makefile.am b/src/Makefile.am index 222b770c..a8995148 100644 --- 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,7 +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 python.cc openbox_wrap.cc + buttonwidget.cc python.cc bindings.cc openbox_wrap.cc MAINTAINERCLEANFILES= Makefile.in @@ -28,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