X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=222b770c187a23bb4b762810ca21c0d3070d5bc5;hb=3827c1a76e27865a9e2cc9da43c42399ea354e18;hp=92e0b3b0ea5a93c5ba56eead1285a998f02568dc;hpb=5f78b51429b204f89b654d634bb4cc8cb78b95f6;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 92e0b3b0..222b770c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,23 +2,22 @@ localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=$(XFT_CFLAGS) $(GUILE_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\"
 
-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
+                  buttonwidget.cc python.cc openbox_wrap.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
@@ -26,10 +25,9 @@ distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
 openbox.i: openbox.hh screen.hh client.hh
-	touch openbox.i
+	touch $@
 
 openbox_wrap.cc: openbox.i
-	swig -python -c++ -nodefault -module openbox -o openbox_wrap.cc openbox.i
-#	swig -guile -c++ -nodefault -o openbox_wrap.cc openbox.i
+	swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
 
 # local dependencies