X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=107f7355ce077e20e4bf19b02e5a351c78390daf;hb=77a46782db2996c0bc662c0f6d191df7a39c2cce;hp=19306b3f48c3af234fd288c2a29cc919e22a843e;hpb=62356a72a95a9f95b933f915f13b284e2be45274;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 19306b3f..107f7355 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,27 +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= configuration.cc screen.cc openbox.cc \
-                 util.cc bbwindow.cc workspace.cc xatom.cc blackbox.cc \
-                 main.cc xeventhandler.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 config.cc
+noinst_HEADERS= actions.hh bindings.hh client.hh frame.hh openbox.hh \
+                python.hh screen.hh config.hh
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
-	rm -f *\~ *.orig *.rej .\#*
-
-# local dependencies
+	$(RM) *\~ *.orig *.rej .\#*