X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=9288490a145cf6a8b866ac240a8364ad9513ea1a;hb=74cfb1b4c115cdb4e05aa823b09d2b5ea9d0d690;hp=9adefeeba4653c058d8009908a6946ee21f18c9b;hpb=bbdca491933fd906bb65cc201c8636d24d4cda71;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 9adefeeb..9288490a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,48 +1,26 @@
 localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 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)\"
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@ $(SWIG_PYTHON_LIB)
 
-INCLUDES= -I../otk
+bin_PROGRAMS= openbox3
 
-bin_PROGRAMS= openbox
-
-openbox_LDADD=../otk/libotk.a @LIBINTL@
-
-openbox_SOURCES= basedisplay.cc configuration.cc screen.cc timer.cc util.cc \
-                 window.cc workspace.cc xatom.cc blackbox.cc main.cc
+openbox3_LDADD=-L../otk -lotk @LIBINTL@
+openbox3_LDFLAGS=-export-dynamic
+openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
+                  main.cc python.cc bindings.cc
+noinst_HEADERS= actions.hh bindings.hh client.hh frame.hh openbox.hh \
+                python.hh screen.hh
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
-	rm -f *\~ *.orig *.rej .\#*
-
-# 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
+	$(RM) *\~ *.orig *.rej .\#*