X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=e406de3f5b98ef439bc7ca26b6c36c5afde74c70;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=4a5ea177251c76770da5a676f07d86bf59a8de35;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a5ea177..e406de3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,27 +1,35 @@
 localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DLOCALEDIR=\"$(localedir)\"
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
 INCLUDES= -I../otk
 
-bin_PROGRAMS= openbox
+bin_PROGRAMS= openbox3
 
-openbox_LDADD=../otk/libotk.a @LIBINTL@
+openbox3_LDADD=-L../otk -lotk @LIBINTL@
 
-openbox_SOURCES= configuration.cc screen.cc openbox.cc \
-                 timer.cc util.cc window.cc workspace.cc xatom.cc blackbox.cc \
-                 main.cc
+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
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
+openbox.i: openbox.hh screen.hh client.hh
+	touch $@
+
+openbox_wrap.cc: openbox.i
+	swig $(filter -I%,$(CXXFLAGS)) -python -c++ -nodefault -o $@ $<
+
 # local dependencies