update children first

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 29b35442fd9572d25ca3ae8cd6475f066021d1b9..e1fb64dea379fde89bb81dcbbfae9130279d1783 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,24 +1,33 @@
 buttonsdir = $(pkgdatadir)/buttons
 scriptdir = $(libdir)/openbox/python
+includeotkdir = $(includedir)/otk
 
 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
-
+includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.hh \
+                   display.hh eventdispatcher.hh eventhandler.hh \
+                   focuslabel.hh focuswidget.hh font.hh label.hh otk.hh \
+                   point.hh property.hh pseudorendercontrol.hh rect.hh \
+                   rendercolor.hh rendercontrol.hh renderstyle.hh \
+                   rendertexture.hh screeninfo.hh strut.hh surface.hh \
+                   timer.hh truerendercontrol.hh ustring.hh util.hh widget.hh
 libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
 MAINTAINERCLEANFILES= Makefile.in
@@ -31,15 +40,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