workaround for swig problem

[chaz/openbox] / util / Makefile.am

diff --git a/util/Makefile.am b/util/Makefile.am
index 9d60a964e5967c9228b62fadac521bb0d45d70a3..7bcc85d8b46cba594c22b1faf95249c37ff24235 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,12 +1,17 @@
-# util/Makefile.am for Blackbox - an X11 Window manager
-
-CPPFLAGS= @CPPFLAGS@ @DEBUG@
+CPPFLAGS= @CPPFLAGS@
 
+#SUBDIRS =             epist
 bin_SCRIPTS =          bsetbg
-bin_PROGRAMS =         bsetroot
+bin_PROGRAMS =         bsetroot xftlsfonts
 
 bsetroot_SOURCES =     bsetroot.cc
-bsetroot_LDADD =       ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o
+bsetroot_LDADD =       ../src/basedisplay.o ../otk/color.o ../otk/gccache.o \
+                       ../otk/texture.o ../src/timer.o ../otk/image.o \
+                       ../otk/imagecontrol.o ../src/util.o ../src/screeninfo.o
+
+xftlsfonts_SOURCES = xftlsfonts.cc
+
+INCLUDES= -I../src -I../otk
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -14,8 +19,3 @@ distclean-local:
        rm -f *\~ .\#*
 
 # local dependencies
-
-bsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \
- ../src/../nls/blackbox-nls.hh ../src/GCCache.hh ../src/BaseDisplay.hh \
- ../src/Timer.hh ../src/Color.hh ../src/Texture.hh ../src/Util.hh \
- bsetroot.hh ../src/Image.hh