merge Sami Kerola's new build-system

author: Mathias Gumz <mathias gumz at gmail com> 2014-04-11 15:42:09 (GMT)
committer: Mathias Gumz <mathias gumz at gmail com> 2014-04-11 15:42:40 (GMT)
commit: e105de7d46c4936790754857d8c789f3c7fccd87 (patch)
tree: caaf0481ae7d743507f67d7d4e3977f31b153f65 /src/tests
parent: bc272ba4aed707522cb458d659940567ac6fc386 (diff)
parent: 7541054b299bbd61310ab0456cf4f25b7a672de3 (diff)
download: fluxbox-e105de7d46c4936790754857d8c789f3c7fccd87.zip
fluxbox-e105de7d46c4936790754857d8c789f3c7fccd87.tar.bz2
4 files changed, 104 insertions, 30 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
deleted file mode 100644
index b6678ce..0000000
--- a/src/tests/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AM_CPPFLAGS= -I$(top_srcdir)/src
-noinst_PROGRAMS= \
-         testTexture \
-         testFont \
-         testKeys \
-         testDemandAttention \
-         testFullscreen \
-         testStringUtil \
-         testRectangleUtil
-testTexture_SOURCES         = texturetest.cc
-testFont_SOURCES            = testFont.cc
-testKeys_SOURCES            = testKeys.cc
-testDemandAttention_SOURCES = testDemandAttention.cc
-#testResource_SOURCES        = Resourcetest.cc
-testFullscreen_SOURCES      = fullscreentest.cc
-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
diff --git a/src/tests/Resourcetest.cc b/src/tests/Resourcetest.cc
index 53b5ec4..a1df8d9 100644
--- a/src/tests/Resourcetest.cc
+++ b/src/tests/Resourcetest.cc
@@ -21,11 +21,6 @@
 #include "Resource.hh"
-//use of strcasecmp 
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
-#endif // _GNU_SOURCE
 #include <string>
 #include <iostream>
 #ifdef HAVE_CSTDIO
diff --git a/src/tests/StringUtiltest.cc b/src/tests/StringUtiltest.cc
index a821184..220949e 100644
--- a/src/tests/StringUtiltest.cc
+++ b/src/tests/StringUtiltest.cc
@@ -20,9 +20,6 @@
 // DEALINGS IN THE SOFTWARE.
 #include "FbTk/StringUtil.hh"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE
 #include <cstring>
 #include <cstdlib>
author	Mathias Gumz <mathias gumz at gmail com>	2014-04-11 15:42:09 (GMT)
committer	Mathias Gumz <mathias gumz at gmail com>	2014-04-11 15:42:40 (GMT)
commit	e105de7d46c4936790754857d8c789f3c7fccd87 (patch)
tree	caaf0481ae7d743507f67d7d4e3977f31b153f65 /src/tests
parent	bc272ba4aed707522cb458d659940567ac6fc386 (diff)
parent	7541054b299bbd61310ab0456cf4f25b7a672de3 (diff)
download	fluxbox-e105de7d46c4936790754857d8c789f3c7fccd87.zip fluxbox-e105de7d46c4936790754857d8c789f3c7fccd87.tar.bz2

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am deleted file mode 100644 index b6678ce..0000000 --- a/src/tests/Makefile.am +++ /dev/null
@@ -1,22 +0,0 @@
1	AM_CPPFLAGS= -I$(top_srcdir)/src
2
3	noinst_PROGRAMS= \
4	testTexture \
5	testFont \
6	testKeys \
7	testDemandAttention \
8	testFullscreen \
9	testStringUtil \
10	testRectangleUtil
11
12	testTexture_SOURCES = texturetest.cc
13	testFont_SOURCES = testFont.cc
14	testKeys_SOURCES = testKeys.cc
15	testDemandAttention_SOURCES = testDemandAttention.cc
16	#testResource_SOURCES = Resourcetest.cc
17	testFullscreen_SOURCES = fullscreentest.cc
18	testStringUtil_SOURCES = StringUtiltest.cc
19	testRectangleUtil_SOURCES = testRectangleUtil.cc
20
21	LDADD=../FbTk/libFbTk.a
22


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 @@
		1	check_PROGRAMS= \
		2	testDemandAttention \
		3	testFont \
		4	testFullscreen \
		5	testKeys \
		6	testRectangleUtil \
		7	testSignals \
		8	testStringUtil \
		9	testTexture
		10
		11	testDemandAttention_LDFLAGS = \
		12	$(FONTCONFIG_LIBS) \
		13	$(FRIBIDI_LIBS) \
		14	$(X11_LIBS) \
		15	$(XFT_LIBS) \
		16	$(XRENDER_LIBS) \
		17	$(X_LIBS)
		18	testDemandAttention_CPPFLAGS = \
		19	$(AM_CPPFLAGS) \
		20	-I$(fbtk_incdir)
		21	testDemandAttention_SOURCES = \
		22	src/tests/testDemandAttention.cc
		23
		24	testFont_LDFLAGS = \
		25	$(FONTCONFIG_LIBS) \
		26	$(FRIBIDI_LIBS) \
		27	$(X11_LIBS) \
		28	$(XFT_LIBS) \
		29	$(XRENDER_LIBS) \
		30	$(X_LIBS)
		31	testFont_CPPFLAGS = \
		32	$(AM_CPPFLAGS) \
		33	-I$(fbtk_incdir)
		34	testFont_SOURCES = \
		35	src/tests/testFont.cc
		36
		37	testFullscreen_LDFLAGS = \
		38	$(FONTCONFIG_LIBS) \
		39	$(FRIBIDI_LIBS) \
		40	$(X11_LIBS) \
		41	$(XFT_LIBS) \
		42	$(XRENDER_LIBS) \
		43	$(X_LIBS)
		44	testFullscreen_CPPFLAGS = \
		45	$(AM_CPPFLAGS) \
		46	-I$(fbtk_incdir) \
		47	-I$(src_incdir)
		48	testFullscreen_SOURCES = \
		49	src/tests/fullscreentest.cc
		50
		51	testKeys_LDFLAGS = \
		52	$(FONTCONFIG_LIBS) \
		53	$(FRIBIDI_LIBS) \
		54	$(X11_LIBS) \
		55	$(XFT_LIBS) \
		56	$(XRENDER_LIBS) \
		57	$(X_LIBS)
		58	testKeys_CPPFLAGS = \
		59	$(AM_CPPFLAGS) \
		60	-I$(fbtk_incdir)
		61	testKeys_SOURCES = \
		62	src/tests/testKeys.cc
		63
		64	testRectangleUtil_SOURCES = \
		65	src/RectangleUtil.hh \
		66	src/tests/testRectangleUtil.cc
		67	testRectangleUtil_CPPFLAGS = \
		68	$(AM_CPPFLAGS) \
		69	-I$(top_srcdir)/src
		70
		71	testSignals_LDFLAGS = \
		72	$(FRIBIDI_LIBS) \
		73	$(X11_LIBS) \
		74	$(XRENDER_LIBS) \
		75	$(X_LIBS)
		76
		77	testSignals_SOURCES = \
		78	src/tests/testSignals.cc
		79	testSignals_CPPFLAGS = \
		80	$(AM_CPPFLAGS) \
		81	-I$(fbtk_incdir)
		82
		83	testStringUtil_SOURCES = \
		84	src/tests/StringUtiltest.cc
		85	testStringUtil_CPPFLAGS = \
		86	$(AM_CPPFLAGS) \
		87	-I$(fbtk_incdir)
		88
		89	testTexture_LDFLAGS = \
		90	$(FONTCONFIG_LIBS) \
		91	$(FRIBIDI_LIBS) \
		92	$(IMLIB2_LIBS) \
		93	$(X11_LIBS) \
		94	$(XFT_LIBS) \
		95	$(XPM_LIBS) \
		96	$(XRENDER_LIBS) \
		97	$(X_LIBS)
		98	testTexture_SOURCES = \
		99	src/tests/texturetest.cc
		100	testTexture_CPPFLAGS = \
		101	$(AM_CPPFLAGS) \
		102	-I$(fbtk_incdir)
		103
		104	#testResource_SOURCE = Resourcetest.cc


diff --git a/src/tests/Resourcetest.cc b/src/tests/Resourcetest.cc index 53b5ec4..a1df8d9 100644 --- a/src/tests/Resourcetest.cc +++ b/src/tests/Resourcetest.cc
@@ -21,11 +21,6 @@
21		21
22	#include "Resource.hh"	22	#include "Resource.hh"
23		23
24	//use of strcasecmp
25	#ifndef _GNU_SOURCE
26	#define _GNU_SOURCE
27	#endif // _GNU_SOURCE
28
29	#include <string>	24	#include <string>
30	#include <iostream>	25	#include <iostream>
31	#ifdef HAVE_CSTDIO	26	#ifdef HAVE_CSTDIO


diff --git a/src/tests/StringUtiltest.cc b/src/tests/StringUtiltest.cc index a821184..220949e 100644 --- a/src/tests/StringUtiltest.cc +++ b/src/tests/StringUtiltest.cc
@@ -20,9 +20,6 @@
20	// DEALINGS IN THE SOFTWARE.	20	// DEALINGS IN THE SOFTWARE.
21		21
22	#include "FbTk/StringUtil.hh"	22	#include "FbTk/StringUtil.hh"
23	#ifndef _GNU_SOURCE
24	#define _GNU_SOURCE
25	#endif //_GNU_SOURCE
26		23
27	#include <cstring>	24	#include <cstring>
28	#include <cstdlib>	25	#include <cstdlib>