X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=otk%2FMakefile.am;h=08f4d4cd15c84a388a1b70ea08bf73d97216b7e9;hb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;hp=30196070838d70e6d4065eb748562683c340bad9;hpb=a923a55002440ea0bdc291169d7102e1d45953cf;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 30196070..08f4d4cd 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,26 +1,45 @@
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@
+buttonsdir = $(pkgdatadir)/buttons
+includeotkdir = $(includedir)/otk
+pkgconfigdir = $(libdir)/pkgconfig
 
-INCLUDES= -I../src
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ -DBUTTONSDIR=\"$(buttonsdir)\"
 
-noinst_LIBRARIES=libotk.a
+#noinst_LIBRARIES=libotk.a
+lib_LTLIBRARIES=libotk.la
 
-libotk_a_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 button.cc
+libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
+                  renderstyle.cc rendercolor.cc pseudorendercontrol.cc \
+                  display.cc font.cc \
+                  property.cc rect.cc screeninfo.cc \
+                  timer.cc \
+                  util.cc widget.cc focuswidget.cc \
+                  button.cc eventhandler.cc eventdispatcher.cc ustring.cc \
+                  label.cc focuslabel.cc application.cc appwidget.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 \
+                   ../config.h
 
 MAINTAINERCLEANFILES= Makefile.in
 
+pkgconfig_DATA = otk.pc
+
+otk.pc: otk.pc.in
+	@regex_cmd@ -e "s,\@prefix\@,$(prefix)," \
+		-e "s,\@version\@,$(VERSION)," \
+		@srcdir@/$^ > $@
+
 distclean-local:
-	rm -f *\~ *.orig *.rej .\#*
+	$(RM) *\~ *.orig *.rej .\#*
+
+otk_test: libotk.la otk_test.cc
+	$(CXX) $(CPPFLAGS) $(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) $(CPPFLAGS) $(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@
 
 # local dependencies
-color.o: color.cc color.hh display.hh screeninfo.hh rect.hh
-gccache.o: gccache.cc gccache.hh display.hh color.hh assassin.hh \
- screeninfo.hh rect.hh
-rect.o: rect.cc rect.hh
-configuration.o: configuration.cc configuration.hh
-style.o: style.cc style.hh
-util.o: util.cc util.hh
-widget.o: widget.cc widget.hh
-button.o: button.cc button.hh