aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-09-11 16:58:55 (GMT)
committerfluxgen <fluxgen>2003-09-11 16:58:55 (GMT)
commit16653d23d5d7a0dd017cce6484e8865f59edb9c6 (patch)
tree8f24d7b29f62d7e32af537ccc81d055dedbd72fc
parentfbe722de6da27d80c69551bdeffa271764094c6f (diff)
downloadfluxbox-16653d23d5d7a0dd017cce6484e8865f59edb9c6.zip
fluxbox-16653d23d5d7a0dd017cce6484e8865f59edb9c6.tar.bz2
update
-rw-r--r--src/tests/Makefile36
1 files changed, 8 insertions, 28 deletions
diff --git a/src/tests/Makefile b/src/tests/Makefile
index 90e45ce..3b4b7e7 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -6,48 +6,28 @@ XLIBS= -L/usr/X11R6/lib -lX11 -lXft
6COMPILEFILE=$(CXX) -c $(CXXFLAGS) 6COMPILEFILE=$(CXX) -c $(CXXFLAGS)
7FONT_OBJ = ../FbTk/libFbTk.a 7FONT_OBJ = ../FbTk/libFbTk.a
8 8
9all: testLayers testStringUtil testKeys testResource testSignal glxtest 9all: testStringUtil testFont
10 10
11.cc.o: 11.cc.o:
12 $(CXX) -c $(CXXFLAGS) $< 12 $(CXX) -c $(CXXFLAGS) $<
13 13
14../FbTk/XftFontImp.o: ../FbTk/XftFontImp.hh ../FbTk/XftFontImp.cc
15
16../FbTk/XmbFontImp.o: ../FbTk/XmbFontImp.hh ../FbTk/XmbFontImp.cc
17
18../FbTk/XFontImp.o: ../FbTk/XFontImp.hh ../FbTk/XFontImp.cc
19
20../FbTk/Font.o: ../FbTk/XFontImp.hh ../FbTk/XftFontImp.hh ../FbTk/XmbFontImp.hh ../FbTk/Font.hh ../FbTk/Font.cc
21
22glxtest: ../FbTk/App.hh glxtest.cc 14glxtest: ../FbTk/App.hh glxtest.cc
23 ${CXX} glxtest.cc ${CXXFLAGS} ${XLIBS} -lGL -lGLU -lXpm -o glxtest 15 ${CXX} glxtest.cc ${CXXFLAGS} ${XLIBS} -lGL -lGLU -lXpm -o glxtest
24 16
25StringUtil.o: ../StringUtil.cc ../StringUtil.hh 17testStringUtil: StringUtiltest.o
26 $(CXX) -c $(CXXFLAGS) ../StringUtil.cc 18 $(CXX) $(LIBS) StringUtiltest.o -o testStringUtil
27
28Keys.o: ../Keys.cc ../Keys.hh
29 $(CXX) -c $(CXXFLAGS) $(XFLAGS) ../Keys.cc -o Keys.o
30
31Resource.o: ../Resource.cc ../Resource.hh
32 $(CXX) -c $(CXXFLAGS) $(XFLAGS) ../Resource.cc -o Resource.o
33
34../FbTk/SignalHandler.o:
35 ${COMPILEFILE} ../FbTk/SignalHandler.cc -o ../FbTk/SignalHandler.o
36
37testStringUtil: StringUtiltest.o ../FbTk/StringUtil.o
38 $(CXX) $(LIBS) StringUtiltest.o ../FbTk/StringUtil.o -o testStringUtil
39 19
40testKeys: Keys.o testKeys.o StringUtil.o 20testKeys: testKeys.o
41 $(CXX) $(LIBS) $(XLIBS) StringUtil.o Keys.o testKeys.o -o testKeys 21 $(CXX) $(LIBS) $(XLIBS) testKeys.o -o testKeys
42 22
43testResource: Resourcetest.o Resource.o 23testResource: Resourcetest.o Resource.o
44 ${CXX} ${LIBS} ${XLIBS} Resourcetest.o Resource.o -o testResource 24 ${CXX} ${LIBS} ${XLIBS} Resourcetest.o Resource.o -o testResource
45 25
46testSignal: signaltest.cc ../FbTk/SignalHandler.o 26testSignal: signaltest.cc
47 ${CXX} ${LIBS} signaltest.cc ../FbTk/SignalHandler.o -o testSignal 27 ${CXX} ${LIBS} signaltest.cc -o testSignal
48 28
49testFont: testFont.cc ${FONT_OBJ} 29testFont: testFont.cc ${FONT_OBJ}
50 ${CXX} ${CXXFLAGS} ${XLIBS} testFont.cc ${FONT_OBJ} -o testFont 30 ${CXX} testFont.cc -o testFont ${CXXFLAGS} ${XLIBS}
51 31
52testLayers: testLayers.cc 32testLayers: testLayers.cc
53 ${CXX} ${CXXFLAGS} ${XLIBS} testLayers.cc ../FbTk/libFbTk.a -o testLayers 33 ${CXX} ${CXXFLAGS} ${XLIBS} testLayers.cc ../FbTk/libFbTk.a -o testLayers