X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=efb49e1ffa78416769442ce5f3a17749d19441d3;hb=a5a712f9ae652e500c81b42db548d213bde4712e;hp=07bb65efbdd4da597410f8ea9ee332344f2ecb48;hpb=a767993e8bc832a5347b952942f5d561781bd867;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 07bb65ef..efb49e1f 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,9 +21,12 @@ 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
+noinst_HEADERS= actions.hh backgroundwidget.hh bindings.hh buttonwidget.hh \
+                client.hh frame.hh labelwidget.hh openbox.hh python.hh \
+                screen.hh widgetbase.hh
 openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
 
-script_DATA = openbox.py
+script_DATA = ob.py
 
 EXTRA_DIST = $(script_DATA)
 
@@ -35,7 +38,9 @@ distclean-local:
 openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
 	touch $@
 
-openbox_wrap.cc: openbox.i
-	swig -I../otk $(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