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

diff --git a/otk/Makefile.am b/otk/Makefile.am
index c6c600a8..08f4d4cd 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,31 +1,45 @@
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
--Dmultibyte\(\)=True
+buttonsdir = $(pkgdatadir)/buttons
+includeotkdir = $(includedir)/otk
+pkgconfigdir = $(libdir)/pkgconfig
 
-INCLUDES= -I../src
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ -DBUTTONSDIR=\"$(buttonsdir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+#noinst_LIBRARIES=libotk.a
+lib_LTLIBRARIES=libotk.la
 
-noinst_LIBRARIES=libotk.a
-
-libotk_a_SOURCES= color.cc font.cc gccache.cc image.cc imagecontrol.cc \
-                  texture.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 ../src/basedisplay.hh ../src/timer.hh ../src/util.hh
-font.o: font.cc font.hh ../src/screen.hh color.hh texture.hh ../src/util.hh image.hh \
- ../src/timer.hh ../src/basedisplay.hh ../src/workspace.hh ../src/xatom.hh ../src/blackbox.hh \
- ../src/configuration.hh gccache.hh
-gccache.o: gccache.cc gccache.hh ../src/basedisplay.hh ../src/timer.hh ../src/util.hh \
- color.hh
-image.o: image.cc ../src/blackbox.hh ../src/basedisplay.hh ../src/timer.hh ../src/util.hh \
- ../src/configuration.hh ../src/xatom.hh gccache.hh color.hh image.hh texture.hh
-imagecontrol.o: imagecontrol.cc ../src/blackbox.hh ../src/basedisplay.hh ../src/timer.hh \
- ../src/util.hh ../src/configuration.hh ../src/xatom.hh color.hh image.hh texture.hh
-texture.o: texture.cc texture.hh color.hh ../src/util.hh ../src/basedisplay.hh \
- ../src/timer.hh image.hh ../src/screen.hh ../src/workspace.hh ../src/xatom.hh \
- ../src/blackbox.hh ../src/configuration.hh