python with callbacks!

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 568ade0edf1ad22deb4b5cf25c03238f8a326d6e..2ca5f35a46970ed80212c0f127adbd405d4e7e0b 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -2,9 +2,10 @@ CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@
 
 INCLUDES= -I../src
 
-noinst_LIBRARIES=libotk.a
+#noinst_LIBRARIES=libotk.a
+noinst_LTLIBRARIES=libotk.la
 
-libotk_a_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
+libotk_la_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
                   property.cc imagecontrol.cc rect.cc screeninfo.cc \
                   texture.cc timer.cc timerqueuemanager.cc style.cc \
                   configuration.cc util.cc widget.cc focuswidget.cc \
@@ -12,7 +13,7 @@ libotk_a_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
                   label.cc focuslabel.cc application.cc appwidget.cc \
                   otk_wrap.cc
 
-#libotk_a_LDFLAGS = $(PYTHON_LDFLAGS)
+libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS)
 
 MAINTAINERCLEANFILES= Makefile.in
 
@@ -26,7 +27,7 @@ otk.i: $(wildcard *.hh)
        touch $@
 
 otk_wrap.cc: otk.i
-       swig -python -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \