X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=2ef58ef07d9bf5e3e78e20c303543263f6f4bae8;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=568ade0edf1ad22deb4b5cf25c03238f8a326d6e;hpb=5869cc29ef15181427e65079d9a52c5d21190206;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 568ade0e..2ef58ef0 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,10 +1,11 @@
-CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@
 
 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
 
@@ -20,13 +21,13 @@ distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
 otk_test: libotk.a otk_test.cc
-	$(CXX) $(CPPFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
+	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
 
 otk.i: $(wildcard *.hh)
 	touch $@
 
 otk_wrap.cc: otk.i
-	swig -python -c++ -nodefault -o $@ $<
+	swig $(filter -I%,$(CXXFLAGS)) -python -c++ -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \