X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=6bcafba0278f2d680aa9ebf4fcd8de92321777cc;hb=f11bd1b0cc5973590d1ee547736ac00f50447efa;hp=3a4f9865cad5c6e84fd505047d33c3bd6639b319;hpb=fe55bb846db1933d8d6f023236298940cab441f8;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a4f9865..6bcafba0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,36 @@
 localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=$(XFT_CFLAGS) $(GUILE_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DLOCALEDIR=\"$(localedir)\"
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
-LIBS=$(XFT_LIBS) $(GUILE_LDFLAGS) $(PYTHON_LDFLAGS) @LIBS@
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
 INCLUDES= -I../otk
 
 bin_PROGRAMS= openbox3
 
-openbox3_LDADD=../otk/libotk.a @LIBINTL@
+openbox3_LDADD=-L../otk -lotk @LIBINTL@
 
 openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
-                  main.cc rootwindow.cc backgroundwidget.cc labelwidget.cc \
-                  buttonwidget.cc openbox_wrap.cc
-# guile.cc
+                  main.cc backgroundwidget.cc labelwidget.cc \
+                  buttonwidget.cc python.cc bindings.cc \
+                  openbox_wrap.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
-openbox.i: openbox.hh screen.hh client.hh
-	touch openbox.i
+openbox.i: openbox.hh screen.hh client.hh python.hh
+	touch $@
 
 openbox_wrap.cc: openbox.i
-	swig -python -c++ -nodefault -o openbox_wrap.cc openbox.i
-#	swig -guile -c++ -nodefault -o openbox_wrap.cc openbox.i
+	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 
 # local dependencies