X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2FMakefile.am;h=a7a9f5bb8f5eb7e3b4f6bca491fe67b643331ede;hb=b1cc4b4fe307e6aacdb665587216669f48d5c769;hp=118c56fc8a76a1e9d4f6013c081f9449a982a463;hpb=fb7b6b37615cafa5d553560d78f931e0003fb6cc;p=chaz%2Fopenbox

diff --git a/util/Makefile.am b/util/Makefile.am
index 118c56fc..a7a9f5bb 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,25 +1,23 @@
 # util/Makefile.am for Blackbox - an X11 Window manager
 
-CPPFLAGS= @CPPFLAGS@ @DEBUG@
+CXXFLAGS= @CXXFLAGS@
 
-SUBDIRS = 			epist
+#SUBDIRS = 		epist
 bin_SCRIPTS = 		bsetbg
 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
 
 xftlsfonts_SOURCES = xftlsfonts.cc
 
+INCLUDES= -I../src -I../otk
+
 MAINTAINERCLEANFILES =	Makefile.in
 
 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
-xftlsfonts.o: xftlsfonts.cc