X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=9fb61d341f20d2dcd393cc9003e791359394b20c;hb=ed4696f6910047ae596a874ef3f1f85b5390aadb;hp=075f4a412df40bace75225bc4a83765ebe12ee52;hpb=bbdca491933fd906bb65cc201c8636d24d4cda71;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 075f4a41..9fb61d34 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,28 +1,30 @@
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@
 
 INCLUDES= -I../src
 
 noinst_LIBRARIES=libotk.a
 
-libotk_a_SOURCES= color.cc font.cc gccache.cc image.cc imagecontrol.cc \
-                  texture.cc
+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 focuswidget.cc button.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
+otk_test: libotk.a otk_test.cc
+	$(CXX) $(CPPFLAGS) -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 
+
 # 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
+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
+focuswidget.o: focuswidget.cc focuswidget.hh
+button.o: button.cc button.hh