X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=wrap%2FMakefile.am;h=3f90488273f58da550de4b37d05c26dbde100724;hb=bcca5bb967f792e6dd9a1031e4bdcbef13be754d;hp=ec7b0b48f11a5dcfb0bb90a46a21db9845255241;hpb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;p=chaz%2Fopenbox

diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index ec7b0b48..3f904882 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -3,10 +3,9 @@ oblibdir = $(libdir)/openbox
 #pythondir = $(oblibdir)/python
 obpythondir = $(oblibdir)/python
 
-CPPFLAGS = $(XFT_CFLAGS) $(SWIG_PYTHON_CFLAGS) @CPPFLAGS@
+CPPFLAGS = -I$(srcdir)/../otk -I$(srcdir)/../src $(XFT_CFLAGS) $(SWIG_PYTHON_CFLAGS) @CPPFLAGS@
 CXXFLAGS = $(filter-out -W -Wall,@CXXFLAGS@)
 LDFLAGS  = -module -avoid-version
-INCLUDES = -I.. -I../otk -I../src
 
 obpython_LTLIBRARIES = otkpy.la obpy.la
 obpython_PYTHON = otk.py ob.py
@@ -16,6 +15,8 @@ otkpy_la_SOURCES  = wrap_otk.cc
 
 obpy_la_SOURCES  = wrap_ob.cc
 
+EXTRA_DIST = otk.i ob.i callback.i
+
 CLEANFILES = wrap_* *.py
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -30,7 +31,7 @@ install-exec-hook:
 uninstall-am:
 	$(RM) "$(DESTDIR)$(obpythondir)/_otk.so"
 	$(RM) "$(DESTDIR)$(obpythondir)/_ob.so"
-	rmdir -p $(obpythondir) || true
+	-rmdir -p $(obpythondir)
 
 %.py: wrap_%.cc
 
@@ -40,9 +41,9 @@ otk.i: $(wildcard ../otk/*.hh)
 ob.i: $(addprefix ../src/,openbox.hh screen.hh client.hh python.hh frame.hh)
 	@touch $@
 
-wrap_otk.cc: otk.i
-	$(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<
+wrap_otk.cc: otk.i otk_point.i otk_rect.i otk_size.i otk_rendercolor.i otk_rendertexture.i otk_ustring.i otk_font.i otk_renderstyle.i otk_widget.i otk_label.i otk_button.i otk_appwidget.i otk_application.i otk_strut.i otk_property.i otk_timer.i
+	$(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<
 
-wrap_ob.cc: ob.i callback.i
-	$(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<
+wrap_ob.cc: ob.i ob_callback.i ob_client.i ob_screen.i ob_openbox.i ob_frame.i ob_python.i
+	$(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<