2 files changed, 104 insertions, 30 deletions

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
deleted file mode 100644
index 73f269f..0000000
--- a/src/tests/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-AM_CPPFLAGS= -I$(top_srcdir)/src -include $(top_builddir)/config.h
-
-noinst_PROGRAMS= \
-         testTexture \
-         testFont \
-         testSignals \
-         testKeys \
-         testDemandAttention \
-         testFullscreen \
-         testStringUtil \
-         testRectangleUtil
-
-testTexture_SOURCES         = texturetest.cc
-testTexture_LDFLAGS         = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(IMLIB2_LIBS) $(XPM_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testFont_SOURCES            = testFont.cc
-testFont_LDFLAGS            = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testSignals_SOURCES         = testSignals.cc
-testSignals_LDFLAGS         = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS)
-testKeys_SOURCES            = testKeys.cc
-testKeys_LDFLAGS            = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testDemandAttention_SOURCES = testDemandAttention.cc
-testDemandAttention_LDFLAGS = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-#testResource_SOURCES        = Resourcetest.cc
-testFullscreen_SOURCES      = fullscreentest.cc
-testFullscreen_LDFLAGS      = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
-testStringUtil_SOURCES      = StringUtiltest.cc
-testRectangleUtil_SOURCES   = testRectangleUtil.cc
-
-LDADD=../FbTk/libFbTk.a
-
diff --git a/src/tests/Makemodule.am b/src/tests/Makemodule.am
new file mode 100644
index 0000000..4ef9a16
--- /dev/null
+++ b/src/tests/Makemodule.am
@@ -0,0 +1,104 @@
+check_PROGRAMS= \
+        testDemandAttention \
+        testFont \
+        testFullscreen \
+        testKeys \
+        testRectangleUtil \
+        testSignals \
+        testStringUtil \
+        testTexture
+
+testDemandAttention_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_LIBS)
+testDemandAttention_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+testDemandAttention_SOURCES = \
+        src/tests/testDemandAttention.cc
+
+testFont_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_LIBS)
+testFont_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+testFont_SOURCES = \
+        src/tests/testFont.cc
+
+testFullscreen_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_LIBS)
+testFullscreen_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir) \
+        -I$(src_incdir)
+testFullscreen_SOURCES = \
+        src/tests/fullscreentest.cc
+
+testKeys_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_LIBS)
+testKeys_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+testKeys_SOURCES = \
+        src/tests/testKeys.cc
+
+testRectangleUtil_SOURCES = \
+        src/RectangleUtil.hh \
+        src/tests/testRectangleUtil.cc
+testRectangleUtil_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(top_srcdir)/src
+
+testSignals_LDFLAGS = \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_LIBS)
+
+testSignals_SOURCES = \
+        src/tests/testSignals.cc
+testSignals_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+
+testStringUtil_SOURCES = \
+        src/tests/StringUtiltest.cc
+testStringUtil_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+
+testTexture_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(IMLIB2_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XPM_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_LIBS)
+testTexture_SOURCES = \
+        src/tests/texturetest.cc
+testTexture_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+
+#testResource_SOURCE = Resourcetest.cc