diff options
| -rw-r--r-- | src/tests/Makemodule.am | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/tests/Makemodule.am b/src/tests/Makemodule.am index 7607721..78b695e 100644 --- a/src/tests/Makemodule.am +++ b/src/tests/Makemodule.am | |||
| @@ -10,39 +10,32 @@ check_PROGRAMS= \ | |||
| 10 | testDemandAttention_LDFLAGS = \ | 10 | testDemandAttention_LDFLAGS = \ |
| 11 | $(FONTCONFIG_LIBS) \ | 11 | $(FONTCONFIG_LIBS) \ |
| 12 | $(FRIBIDI_LIBS) \ | 12 | $(FRIBIDI_LIBS) \ |
| 13 | $(X11_LIBS) \ | ||
| 14 | $(XFT_LIBS) \ | 13 | $(XFT_LIBS) \ |
| 15 | $(XRENDER_LIBS) \ | 14 | $(XRENDER_LIBS) |
| 16 | $(X_LIBS) | ||
| 17 | testDemandAttention_CPPFLAGS = \ | 15 | testDemandAttention_CPPFLAGS = \ |
| 18 | $(AM_CPPFLAGS) \ | 16 | $(AM_CPPFLAGS) \ |
| 19 | -I$(fbtk_incdir) | 17 | -I$(src_incdir) |
| 20 | testDemandAttention_SOURCES = \ | 18 | testDemandAttention_SOURCES = \ |
| 21 | src/tests/testDemandAttention.cc | 19 | src/tests/testDemandAttention.cc |
| 22 | 20 | ||
| 23 | testFont_LDFLAGS = \ | 21 | testFont_LDFLAGS = \ |
| 24 | $(FONTCONFIG_LIBS) \ | 22 | $(FONTCONFIG_LIBS) \ |
| 25 | $(FRIBIDI_LIBS) \ | 23 | $(FRIBIDI_LIBS) \ |
| 26 | $(X11_LIBS) \ | ||
| 27 | $(XFT_LIBS) \ | 24 | $(XFT_LIBS) \ |
| 28 | $(XRENDER_LIBS) \ | 25 | $(XRENDER_LIBS) |
| 29 | $(X_LIBS) | ||
| 30 | testFont_CPPFLAGS = \ | 26 | testFont_CPPFLAGS = \ |
| 31 | $(AM_CPPFLAGS) \ | 27 | $(AM_CPPFLAGS) \ |
| 32 | -I$(fbtk_incdir) | 28 | -I$(src_incdir) |
| 33 | testFont_SOURCES = \ | 29 | testFont_SOURCES = \ |
| 34 | src/tests/testFont.cc | 30 | src/tests/testFont.cc |
| 35 | 31 | ||
| 36 | testFullscreen_LDFLAGS = \ | 32 | testFullscreen_LDFLAGS = \ |
| 37 | $(FONTCONFIG_LIBS) \ | 33 | $(FONTCONFIG_LIBS) \ |
| 38 | $(FRIBIDI_LIBS) \ | 34 | $(FRIBIDI_LIBS) \ |
| 39 | $(X11_LIBS) \ | ||
| 40 | $(XFT_LIBS) \ | 35 | $(XFT_LIBS) \ |
| 41 | $(XRENDER_LIBS) \ | 36 | $(XRENDER_LIBS) |
| 42 | $(X_LIBS) | ||
| 43 | testFullscreen_CPPFLAGS = \ | 37 | testFullscreen_CPPFLAGS = \ |
| 44 | $(AM_CPPFLAGS) \ | 38 | $(AM_CPPFLAGS) \ |
| 45 | -I$(fbtk_incdir) \ | ||
| 46 | -I$(src_incdir) | 39 | -I$(src_incdir) |
| 47 | testFullscreen_SOURCES = \ | 40 | testFullscreen_SOURCES = \ |
| 48 | src/tests/fullscreentest.cc | 41 | src/tests/fullscreentest.cc |
| @@ -50,13 +43,11 @@ testFullscreen_SOURCES = \ | |||
| 50 | testKeys_LDFLAGS = \ | 43 | testKeys_LDFLAGS = \ |
| 51 | $(FONTCONFIG_LIBS) \ | 44 | $(FONTCONFIG_LIBS) \ |
| 52 | $(FRIBIDI_LIBS) \ | 45 | $(FRIBIDI_LIBS) \ |
| 53 | $(X11_LIBS) \ | ||
| 54 | $(XFT_LIBS) \ | 46 | $(XFT_LIBS) \ |
| 55 | $(XRENDER_LIBS) \ | 47 | $(XRENDER_LIBS) |
| 56 | $(X_LIBS) | ||
| 57 | testKeys_CPPFLAGS = \ | 48 | testKeys_CPPFLAGS = \ |
| 58 | $(AM_CPPFLAGS) \ | 49 | $(AM_CPPFLAGS) \ |
| 59 | -I$(fbtk_incdir) | 50 | -I$(src_incdir) |
| 60 | testKeys_SOURCES = \ | 51 | testKeys_SOURCES = \ |
| 61 | src/tests/testKeys.cc | 52 | src/tests/testKeys.cc |
| 62 | 53 | ||
| @@ -71,21 +62,19 @@ testStringUtil_SOURCES = \ | |||
| 71 | src/tests/StringUtiltest.cc | 62 | src/tests/StringUtiltest.cc |
| 72 | testStringUtil_CPPFLAGS = \ | 63 | testStringUtil_CPPFLAGS = \ |
| 73 | $(AM_CPPFLAGS) \ | 64 | $(AM_CPPFLAGS) \ |
| 74 | -I$(fbtk_incdir) | 65 | -I$(src_incdir) |
| 75 | 66 | ||
| 76 | testTexture_LDFLAGS = \ | 67 | testTexture_LDFLAGS = \ |
| 77 | $(FONTCONFIG_LIBS) \ | 68 | $(FONTCONFIG_LIBS) \ |
| 78 | $(FRIBIDI_LIBS) \ | 69 | $(FRIBIDI_LIBS) \ |
| 79 | $(IMLIB2_LIBS) \ | 70 | $(IMLIB2_LIBS) \ |
| 80 | $(X11_LIBS) \ | ||
| 81 | $(XFT_LIBS) \ | 71 | $(XFT_LIBS) \ |
| 82 | $(XPM_LIBS) \ | 72 | $(XPM_LIBS) \ |
| 83 | $(XRENDER_LIBS) \ | 73 | $(XRENDER_LIBS) |
| 84 | $(X_LIBS) | ||
| 85 | testTexture_SOURCES = \ | 74 | testTexture_SOURCES = \ |
| 86 | src/tests/texturetest.cc | 75 | src/tests/texturetest.cc |
| 87 | testTexture_CPPFLAGS = \ | 76 | testTexture_CPPFLAGS = \ |
| 88 | $(AM_CPPFLAGS) \ | 77 | $(AM_CPPFLAGS) \ |
| 89 | -I$(fbtk_incdir) | 78 | -I$(src_incdir) |
| 90 | 79 | ||
| 91 | #testResource_SOURCE = Resourcetest.cc | 80 | #testResource_SOURCE = Resourcetest.cc |