X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=222b770c187a23bb4b762810ca21c0d3070d5bc5;hb=3827c1a76e27865a9e2cc9da43c42399ea354e18;hp=b6e36e053522d32f8bef9c051e02e6bbb2c31eff;hpb=dd7b8b67bd5e8d1dd3945fe64d16d094a017f7ce;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index b6e36e05..222b770c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,32 @@ localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\"
 
-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= basedisplay.cc configuration.cc screen.cc screeninfo.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%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
+
 # local dependencies