make "make dist" work, compiler flags cleanups

[chaz/openbox] / wrap / Makefile.am

diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index ec7b0b48f11a5dcfb0bb90a46a21db9845255241..38470d809362225845046a96e7b6b22b250f6f94 100644 (file)
--- 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
 
@@ -41,8 +42,8 @@ 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 $@ $<
+       $(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 $@ $<
+       $(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<