X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=07bb65efbdd4da597410f8ea9ee332344f2ecb48;hb=6871cff3face4486055444a6c6218a552ddad461;hp=bc533a2b228ae435b0a5e8960fee302591591766;hpb=f127273aba3670fb4bca54d3521caf5bd189154e;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index bc533a2b..07bb65ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,46 +1,41 @@
+localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
+-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
+-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
+openbox3_LDADD=-L../otk -lotk @LIBINTL@
 
-openbox_SOURCES= basedisplay.cc configuration.cc screen.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 backgroundwidget.cc labelwidget.cc \
+                  buttonwidget.cc python.cc bindings.cc \
+                  openbox_wrap.cc
+openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
+
+script_DATA = openbox.py
+
+EXTRA_DIST = $(script_DATA)
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
+openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
+	touch $@
+
+openbox_wrap.cc: openbox.i
+	swig -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+
 # local dependencies
-basedisplay.o: basedisplay.cc basedisplay.hh timer.hh util.hh \
- ../otk/gccache.hh ../otk/color.hh
-blackbox.o: blackbox.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/gccache.hh ../otk/color.hh ../otk/image.hh screen.hh \
- ../otk/texture.hh workspace.hh window.hh
-configuration.o: configuration.cc configuration.hh util.hh
-main.o: main.cc ../version.h blackbox.hh basedisplay.hh timer.hh \
- util.hh configuration.hh xatom.hh
-screen.o: screen.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/font.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- ../otk/image.hh workspace.hh ../otk/gccache.hh window.hh
-timer.o: timer.cc basedisplay.hh timer.hh util.hh
-util.o: util.cc util.hh
-window.o: window.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/font.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- ../otk/image.hh workspace.hh ../otk/gccache.hh window.hh
-workspace.o: workspace.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/font.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- ../otk/image.hh workspace.hh window.hh
-xatom.o: xatom.cc ../config.h xatom.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- util.hh ../otk/image.hh timer.hh basedisplay.hh workspace.hh blackbox.hh \
- configuration.hh