X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=794d18e8c26b78bdde207ccfbaf44992cd08c5b5;hb=7dbc6db04387c442add000b36639a3f0ed5e183a;hp=29b35442fd9572d25ca3ae8cd6475f066021d1b9;hpb=5face4c6f35172761367f63ac0b6eaf62d84e532;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 29b35442..794d18e8 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -2,19 +2,21 @@ buttonsdir = $(pkgdatadir)/buttons
 scriptdir = $(libdir)/openbox/python
 
 CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
--DBUTTONSDIR=\"$(buttonsdir)\"
+-DBUTTONSDIR=\"$(buttonsdir)\" -DSWIG_GLOBAL
+# -DSWIG_GLOBAL means we don't have to link libswigpy cuz libotk will export
+# everything it would
 
-INCLUDES= -I../src
+#INCLUDES= -I../src
 
 #noinst_LIBRARIES=libotk.a
 lib_LTLIBRARIES=libotk.la
 
 libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
-                  renderstyle.cc rendercolor.cc  \
+                  renderstyle.cc rendercolor.cc pseudorendercontrol.cc \
                   display.cc font.cc \
                   property.cc rect.cc screeninfo.cc \
                   timer.cc \
-                  configuration.cc util.cc widget.cc focuswidget.cc \
+                  util.cc widget.cc focuswidget.cc \
                   button.cc eventhandler.cc eventdispatcher.cc ustring.cc \
                   label.cc focuslabel.cc application.cc appwidget.cc \
                   otk_wrap.cc
@@ -31,15 +33,17 @@ distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
 otk_test: libotk.la otk_test.cc
-	$(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) .libs/libotk.al @LIBS@
+	$(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) -L. -lotk @LIBS@
 
 rendertest: libotk.la rendertest.cc
-	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o $@ rendertest.cc $(XFT_LIBS) .libs/libotk.al @LIBS@
+	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o $@ rendertest.cc $(XFT_LIBS) -L. -lotk @LIBS@
+
+%.py: %_wrap.cc
 
 otk.i: $(wildcard *.hh)
 	touch $@
 
 %_wrap.cc: %.i
-	swig -c $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 
 # local dependencies