X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=107f7355ce077e20e4bf19b02e5a351c78390daf;hb=88a8bc413b433dc7196c17f4e318ae920ae7d1e6;hp=222b770c187a23bb4b762810ca21c0d3070d5bc5;hpb=f9107b5c5a4cc03bf544854e8d6d1ba83f6cd979;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 222b770c..107f7355 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,33 +1,26 @@
 localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
 CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DLOCALEDIR=\"$(localedir)\"
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
-LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
-
-INCLUDES= -I../otk
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@ $(SWIG_PYTHON_LIB)
 
 bin_PROGRAMS= openbox3
 
 openbox3_LDADD=-L../otk -lotk @LIBINTL@
-
+openbox3_LDFLAGS=-export-dynamic
 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
+                  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 .\#*
-
-openbox.i: openbox.hh screen.hh client.hh
-	touch $@
-
-openbox_wrap.cc: openbox.i
-	swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
-
-# local dependencies
+	$(RM) *\~ *.orig *.rej .\#*