1 files changed, 19 insertions, 15 deletions

diff --git a/src/tests/Makefile b/src/tests/Makefile
index 4e1d80c..a6cc02f 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -1,36 +1,36 @@
 CXX=g++
-CXXFLAGS= -I.. -DDEBUG -DUSE_XFT -Wall -g -O2
+CXXFLAGS= -I.. -I../FbTk -DDEBUG -DUSE_XFT -Wall -g -O2
 LIBS=
 XFLAGS= -I/usr/X11R6/include
 XLIBS= -L/usr/X11R6/lib -lX11 -lXft
 COMPILEFILE=$(CXX) -c $(CXXFLAGS)
-FONT_OBJ = ../BaseDisplay.o ../Font.o ../XFontImp.o ../XftFontImp.o ../XmbFontImp.o \
-        ../Timer.o ../StringUtil.o ../i18n.o
+FONT_OBJ = ../BaseDisplay.o ../FbTk/Font.o ../FbTk/XFontImp.o ../FbTk/XftFontImp.o ../FbTk/XmbFontImp.o \
+        ../FbTk/Timer.o ../StringUtil.o ../i18n.o
 
-all: testStringUtil testKeys testResource testSignal
+all: testLayers testStringUtil testKeys testResource testSignal
 
 .cc.o:
         $(CXX) -c $(CXXFLAGS) $< -o $@
-        
-../XftFontImp.o: ../XftFontImp.hh ../XftFontImp.cc
 
-../XmbFontImp.o: ../XmbFontImp.hh ../XmbFontImp.cc
+../FbTk/XftFontImp.o: ../FbTk/XftFontImp.hh ../FbTk/XftFontImp.cc
 
-../XFontImp.o: ../XFontImp.hh ../XFontImp.cc
+../FbTk/XmbFontImp.o: ../FbTk/XmbFontImp.hh ../FbTk/XmbFontImp.cc
 
-../Font.o: ../XFontImp.hh ../XftFontImp.hh ../XmbFontImp.hh ../Font.hh ../Font.cc
+../FbTk/XFontImp.o: ../FbTk/XFontImp.hh ../FbTk/XFontImp.cc
+
+../FbTk/Font.o: ../FbTk/XFontImp.hh ../FbTk/XftFontImp.hh ../FbTk/XmbFontImp.hh ../FbTk/Font.hh ../FbTk/Font.cc
 
 StringUtil.o: ../StringUtil.cc ../StringUtil.hh
         $(CXX) -c $(CXXFLAGS) ../StringUtil.cc -o StringUtil.o
 
 Keys.o: ../Keys.cc ../Keys.hh
         $(CXX) -c $(CXXFLAGS) $(XFLAGS) ../Keys.cc -o Keys.o
-        
+
 Resource.o: ../Resource.cc ../Resource.hh
         $(CXX) -c $(CXXFLAGS) $(XFLAGS) ../Resource.cc -o Resource.o
 
-../SignalHandler.o:
-        ${COMPILEFILE} ../SignalHandler.cc -o ../SignalHandler.o
+../FbTk/SignalHandler.o:
+        ${COMPILEFILE} ../FbTk/SignalHandler.cc -o ../FbTk/SignalHandler.o
 
 testStringUtil: StringUtiltest.o StringUtil.o
         $(CXX) $(LIBS) StringUtiltest.o StringUtil.o -o testStringUtil
@@ -41,13 +41,17 @@ testKeys: Keys.o testKeys.o StringUtil.o
 testResource: Resourcetest.o Resource.o
         ${CXX} ${LIBS} ${XLIBS} Resourcetest.o Resource.o -o testResource
 
-testSignal: signaltest.cc ../SignalHandler.o
-        ${CXX} ${LIBS} signaltest.cc ../SignalHandler.o -o testSignal
+testSignal: signaltest.cc ../FbTk/SignalHandler.o
+        ${CXX} ${LIBS} signaltest.cc ../FbTk/SignalHandler.o -o testSignal
 
 testFont: testFont.cc ${FONT_OBJ}
         ${CXX} ${CXXFLAGS} ${XLIBS} testFont.cc ${FONT_OBJ} -o testFont
 
-run: testResource testKeys testStringUtil testFont
+testLayers: testLayers.cc
+        ${CXX} ${CXXFLAGS} ${XLIBS} testLayers.cc ../FbTk/libFbTk.a -o testLayers
+
+run: testLayers testResource testKeys testStringUtil testFont
+        ./testLayers
         ./testKeys
         ./testStringUtil
         ./testResource