new timer infrastructure. takes a function pointer for the timeout, with a void*...

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 835874d5124fe23ca20cce53d93ba5d776def946..ada95b7ffbbcae7e2b0ca11356ea8b32e3f22e12 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,18 +1,11 @@
-DEFAULT_MENU=$(pkgdatadir)/menu
-DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
-
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
--DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--Dmultibyte\(\)=True
+CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@
 
 INCLUDES= -I../src
 
-LDFLAGS=`pkg-config --libs xft`
-
 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 \
+                  imagecontrol.cc rect.cc screeninfo.cc texture.cc timer.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
@@ -20,16 +13,7 @@ distclean-local:
        rm -f *\~ *.orig *.rej .\#*
 
 # 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