From d8c11d0852d889f4df23c9398463aa3848e0e7c7 Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Mon, 5 Jan 2015 21:38:14 +0100 Subject: Fix 'make check' --- src/tests/Makemodule.am | 31 ++++++++++--------------------- 1 file 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= \ testDemandAttention_LDFLAGS = \ $(FONTCONFIG_LIBS) \ $(FRIBIDI_LIBS) \ - $(X11_LIBS) \ $(XFT_LIBS) \ - $(XRENDER_LIBS) \ - $(X_LIBS) + $(XRENDER_LIBS) testDemandAttention_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(fbtk_incdir) + -I$(src_incdir) testDemandAttention_SOURCES = \ src/tests/testDemandAttention.cc testFont_LDFLAGS = \ $(FONTCONFIG_LIBS) \ $(FRIBIDI_LIBS) \ - $(X11_LIBS) \ $(XFT_LIBS) \ - $(XRENDER_LIBS) \ - $(X_LIBS) + $(XRENDER_LIBS) testFont_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(fbtk_incdir) + -I$(src_incdir) testFont_SOURCES = \ src/tests/testFont.cc testFullscreen_LDFLAGS = \ $(FONTCONFIG_LIBS) \ $(FRIBIDI_LIBS) \ - $(X11_LIBS) \ $(XFT_LIBS) \ - $(XRENDER_LIBS) \ - $(X_LIBS) + $(XRENDER_LIBS) testFullscreen_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(fbtk_incdir) \ -I$(src_incdir) testFullscreen_SOURCES = \ src/tests/fullscreentest.cc @@ -50,13 +43,11 @@ testFullscreen_SOURCES = \ testKeys_LDFLAGS = \ $(FONTCONFIG_LIBS) \ $(FRIBIDI_LIBS) \ - $(X11_LIBS) \ $(XFT_LIBS) \ - $(XRENDER_LIBS) \ - $(X_LIBS) + $(XRENDER_LIBS) testKeys_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(fbtk_incdir) + -I$(src_incdir) testKeys_SOURCES = \ src/tests/testKeys.cc @@ -71,21 +62,19 @@ testStringUtil_SOURCES = \ src/tests/StringUtiltest.cc testStringUtil_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(fbtk_incdir) + -I$(src_incdir) testTexture_LDFLAGS = \ $(FONTCONFIG_LIBS) \ $(FRIBIDI_LIBS) \ $(IMLIB2_LIBS) \ - $(X11_LIBS) \ $(XFT_LIBS) \ $(XPM_LIBS) \ - $(XRENDER_LIBS) \ - $(X_LIBS) + $(XRENDER_LIBS) testTexture_SOURCES = \ src/tests/texturetest.cc testTexture_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(fbtk_incdir) + -I$(src_incdir) #testResource_SOURCE = Resourcetest.cc -- cgit v0.11.2