X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=cbb636405f4e99a5b54c1f4ea506664368236b4e;hb=1da8531a7b4eea22592b6d0760352d2a34e9b6b0;hp=76ba15b7400292acb7a5e2d28c6bce24cb12c351;hpb=e0878c9fc2db8843891816e65917fbcfd1e94cbb;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 76ba15b7..cbb63640 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 
 LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
-INCLUDES= -I../otk
+INCLUDES= -I..
 
 bin_PROGRAMS= openbox3
 
@@ -21,8 +21,9 @@ openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
                   main.cc backgroundwidget.cc labelwidget.cc \
                   buttonwidget.cc python.cc bindings.cc \
                   openbox_wrap.cc
+openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
 
-script_DATA = openbox.py
+script_DATA = ob.py
 
 EXTRA_DIST = $(script_DATA)
 
@@ -31,10 +32,12 @@ MAINTAINERCLEANFILES= Makefile.in
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
-openbox.i: openbox.hh screen.hh client.hh python.hh
+openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
 	touch $@
 
-openbox_wrap.cc: openbox.i
-	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+%.py: %_wrap.cc
+
+%_wrap.cc: %.i
+	swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 
 # local dependencies