X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=c714f472fcdce059c66077a2671a4e350e945f77;hb=5168a8add5ed46f74b615ecc60738c1113606734;hp=3677c2b6b19d2fa31cf2018fd3c987e14daa1d13;hpb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 3677c2b6..c714f472 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -8,23 +8,28 @@ INCLUDES= -I../src
 #noinst_LIBRARIES=libotk.a
 noinst_LTLIBRARIES=libotk.la
 
-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 style.cc \
+libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
+                  renderstyle.cc rendercolor.cc  \
+                  display.cc font.cc \
+                  property.cc rect.cc screeninfo.cc \
+                  timer.cc \
                   configuration.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
 
-libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS)
+libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
-otk_test: libotk.a 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) ./libotk.a 
+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@
+
+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@
 
 #otk.i: $(wildcard *.hh)
 #	touch $@