M src/tests/Makefile → src/tests/Makefile

@@ -6,48 +6,28 @@ XLIBS= -L/usr/X11R6/lib -lX11 -lXft
 COMPILEFILE=$(CXX) -c $(CXXFLAGS)
 FONT_OBJ = ../FbTk/libFbTk.a
 
-all: testLayers testStringUtil testKeys testResource testSignal glxtest
+all: testStringUtil testFont
 
 .cc.o:
 	$(CXX) -c $(CXXFLAGS) $<
 
-../FbTk/XftFontImp.o: ../FbTk/XftFontImp.hh ../FbTk/XftFontImp.cc
-
-../FbTk/XmbFontImp.o: ../FbTk/XmbFontImp.hh ../FbTk/XmbFontImp.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
-
 glxtest: ../FbTk/App.hh glxtest.cc
 	${CXX} glxtest.cc ${CXXFLAGS} ${XLIBS} -lGL -lGLU -lXpm -o glxtest
 
-StringUtil.o: ../StringUtil.cc ../StringUtil.hh
-	$(CXX) -c $(CXXFLAGS) ../StringUtil.cc
-
-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
-
-../FbTk/SignalHandler.o:
-	${COMPILEFILE} ../FbTk/SignalHandler.cc -o ../FbTk/SignalHandler.o
+testStringUtil: StringUtiltest.o
+	$(CXX) $(LIBS) StringUtiltest.o -o testStringUtil
 
-testStringUtil: StringUtiltest.o ../FbTk/StringUtil.o
-	$(CXX) $(LIBS) StringUtiltest.o ../FbTk/StringUtil.o -o testStringUtil
-
-testKeys: Keys.o testKeys.o StringUtil.o
-	$(CXX) $(LIBS) $(XLIBS) StringUtil.o Keys.o testKeys.o -o testKeys
+testKeys:  testKeys.o
+	$(CXX) $(LIBS) $(XLIBS) testKeys.o -o testKeys
 
 testResource: Resourcetest.o Resource.o
 	${CXX} ${LIBS} ${XLIBS} Resourcetest.o Resource.o -o testResource
 
-testSignal: signaltest.cc ../FbTk/SignalHandler.o
-	${CXX} ${LIBS} signaltest.cc ../FbTk/SignalHandler.o -o testSignal
+testSignal: signaltest.cc 
+	${CXX} ${LIBS} signaltest.cc -o testSignal
 
 testFont: testFont.cc ${FONT_OBJ}
-	${CXX} ${CXXFLAGS} ${XLIBS} testFont.cc ${FONT_OBJ} -o testFont
+	${CXX} testFont.cc -o testFont ${CXXFLAGS} ${XLIBS} 
 
 testLayers: testLayers.cc
 	${CXX} ${CXXFLAGS} ${XLIBS} testLayers.cc ../FbTk/libFbTk.a -o testLayers