Fix 'make check'

This commit is contained in:
Mathias Gumz 2015-01-05 21:38:14 +01:00
parent a46a4aef08
commit d8c11d0852

View file

@ -10,39 +10,32 @@ check_PROGRAMS= \
testDemandAttention_LDFLAGS = \ testDemandAttention_LDFLAGS = \
$(FONTCONFIG_LIBS) \ $(FONTCONFIG_LIBS) \
$(FRIBIDI_LIBS) \ $(FRIBIDI_LIBS) \
$(X11_LIBS) \
$(XFT_LIBS) \ $(XFT_LIBS) \
$(XRENDER_LIBS) \ $(XRENDER_LIBS)
$(X_LIBS)
testDemandAttention_CPPFLAGS = \ testDemandAttention_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(fbtk_incdir) -I$(src_incdir)
testDemandAttention_SOURCES = \ testDemandAttention_SOURCES = \
src/tests/testDemandAttention.cc src/tests/testDemandAttention.cc
testFont_LDFLAGS = \ testFont_LDFLAGS = \
$(FONTCONFIG_LIBS) \ $(FONTCONFIG_LIBS) \
$(FRIBIDI_LIBS) \ $(FRIBIDI_LIBS) \
$(X11_LIBS) \
$(XFT_LIBS) \ $(XFT_LIBS) \
$(XRENDER_LIBS) \ $(XRENDER_LIBS)
$(X_LIBS)
testFont_CPPFLAGS = \ testFont_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(fbtk_incdir) -I$(src_incdir)
testFont_SOURCES = \ testFont_SOURCES = \
src/tests/testFont.cc src/tests/testFont.cc
testFullscreen_LDFLAGS = \ testFullscreen_LDFLAGS = \
$(FONTCONFIG_LIBS) \ $(FONTCONFIG_LIBS) \
$(FRIBIDI_LIBS) \ $(FRIBIDI_LIBS) \
$(X11_LIBS) \
$(XFT_LIBS) \ $(XFT_LIBS) \
$(XRENDER_LIBS) \ $(XRENDER_LIBS)
$(X_LIBS)
testFullscreen_CPPFLAGS = \ testFullscreen_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(fbtk_incdir) \
-I$(src_incdir) -I$(src_incdir)
testFullscreen_SOURCES = \ testFullscreen_SOURCES = \
src/tests/fullscreentest.cc src/tests/fullscreentest.cc
@ -50,13 +43,11 @@ testFullscreen_SOURCES = \
testKeys_LDFLAGS = \ testKeys_LDFLAGS = \
$(FONTCONFIG_LIBS) \ $(FONTCONFIG_LIBS) \
$(FRIBIDI_LIBS) \ $(FRIBIDI_LIBS) \
$(X11_LIBS) \
$(XFT_LIBS) \ $(XFT_LIBS) \
$(XRENDER_LIBS) \ $(XRENDER_LIBS)
$(X_LIBS)
testKeys_CPPFLAGS = \ testKeys_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(fbtk_incdir) -I$(src_incdir)
testKeys_SOURCES = \ testKeys_SOURCES = \
src/tests/testKeys.cc src/tests/testKeys.cc
@ -71,21 +62,19 @@ testStringUtil_SOURCES = \
src/tests/StringUtiltest.cc src/tests/StringUtiltest.cc
testStringUtil_CPPFLAGS = \ testStringUtil_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(fbtk_incdir) -I$(src_incdir)
testTexture_LDFLAGS = \ testTexture_LDFLAGS = \
$(FONTCONFIG_LIBS) \ $(FONTCONFIG_LIBS) \
$(FRIBIDI_LIBS) \ $(FRIBIDI_LIBS) \
$(IMLIB2_LIBS) \ $(IMLIB2_LIBS) \
$(X11_LIBS) \
$(XFT_LIBS) \ $(XFT_LIBS) \
$(XPM_LIBS) \ $(XPM_LIBS) \
$(XRENDER_LIBS) \ $(XRENDER_LIBS)
$(X_LIBS)
testTexture_SOURCES = \ testTexture_SOURCES = \
src/tests/texturetest.cc src/tests/texturetest.cc
testTexture_CPPFLAGS = \ testTexture_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(fbtk_incdir) -I$(src_incdir)
#testResource_SOURCE = Resourcetest.cc #testResource_SOURCE = Resourcetest.cc