From 74f7670af1848a814568d570d2306ed93ece1a6c Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Fri, 2 Sep 2011 09:50:03 -0500 Subject: Make building tests optional --- tools/testapp/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am index 39de532..ee12ec9 100644 --- a/tools/testapp/Makefile.am +++ b/tools/testapp/Makefile.am @@ -5,7 +5,11 @@ else VER= endif -libexec_PROGRAMS = dbusmenu-testapp +libexec_PROGRAMS = + +if WANT_TESTS +libexec_PROGRAMS += dbusmenu-testapp +endif dbusmenu_testapp_SOURCES = \ main.c -- cgit v1.2.3 From 587b3cdf66d99cc4c52dd49ba04cfbbd518b6c98 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Fri, 2 Sep 2011 21:57:04 -0500 Subject: Remove unneeded dbusmenu-GTK dep in testapp --- tools/testapp/Makefile.am | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tools') diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am index 39de532..f59f839 100644 --- a/tools/testapp/Makefile.am +++ b/tools/testapp/Makefile.am @@ -1,10 +1,4 @@ -if USE_GTK3 -VER=3 -else -VER= -endif - libexec_PROGRAMS = dbusmenu-testapp dbusmenu_testapp_SOURCES = \ @@ -18,6 +12,4 @@ dbusmenu_testapp_CFLAGS = \ dbusmenu_testapp_LDADD = \ $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ - $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ - $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) -- cgit v1.2.3 From 4177700e45a02a7f35b32dc24dd7ec6e150d6a0a Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Mon, 19 Sep 2011 23:43:26 -0500 Subject: Adding an optional build of the dumper --- tools/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 48993f1..029b73e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,11 @@ SUBDIRS = testapp -libexec_PROGRAMS = dbusmenu-dumper +libexec_PROGRAMS = + +if WANT_DBUSMENUDUMPER +libexec_PROGRAMS += dbusmenu-dumper +endif libexec_SCRIPTS = dbusmenu-bench -- cgit v1.2.3