From e32194b8109c6c43cd20d6a6c58699f2cc75e7b4 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 18 Dec 2008 10:48:50 +0100 Subject: [PATCH] Autotools fixes (make the tests compile) --- admin/Makefile.am | 8 ++++---- src/common/Makefile.am | 4 ++-- tests/Makefile.am | 24 ++++++++++++------------ tests/components/Makefile.am | 4 ++-- tests/lib/Makefile.am | 22 +++++++++++----------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/admin/Makefile.am b/admin/Makefile.am index 1b2590905..a8d2da160 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -17,10 +17,10 @@ admin_srcdir = $(top_srcdir)/admin -#noinst_PROGRAMS += vgsuppression -#vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c -#vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -#vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl +noinst_PROGRAMS += vgsuppression +vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c +vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror +vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl liblumieracommon.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl noinst_PROGRAMS += rsvg-convert rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c diff --git a/src/common/Makefile.am b/src/common/Makefile.am index ce2da141e..0d403b34d 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -48,8 +48,8 @@ liblumieracommon_la_SOURCES = \ noinst_HEADERS += \ $(liblumieracommon_la_srcdir)/interface.h \ $(liblumieracommon_la_srcdir)/interfaceregistry.h \ - $(liblumieracommon_la_srcdir)/interfacedescriptor.h \ - $(liblumieracommon_la_srcdir)/plugin.h \ + $(liblumieracommon_la_srcdir)/interfacedescriptor.h \ + $(liblumieracommon_la_srcdir)/plugin.h \ $(liblumieracommon_la_srcdir)/config.h \ $(liblumieracommon_la_srcdir)/configentry.h \ $(liblumieracommon_la_srcdir)/configitem.h \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 73bf93598..77a3db49f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,42 +22,42 @@ tests_srcdir = $(top_srcdir)/tests check_PROGRAMS += test-error test_error_SOURCES = $(tests_srcdir)/error/errortest.c test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_error_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_error_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-locking test_locking_SOURCES = $(tests_srcdir)/library/test-locking.c test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_locking_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_locking_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-llist test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_llist_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_llist_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-psplay test_psplay_SOURCES = $(tests_srcdir)/library/test-psplay.c test_psplay_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_psplay_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_psplay_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-safeclib test_safeclib_SOURCES = $(tests_srcdir)/library/test-safeclib.c test_safeclib_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_safeclib_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_safeclib_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-luid test_luid_SOURCES = $(tests_srcdir)/library/test-luid.c test_luid_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_luid_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_luid_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-filedescriptors test_filedescriptors_SOURCES = $(tests_srcdir)/backend/test-filedescriptors.c test_filedescriptors_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_filedescriptors_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_filedescriptors_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-filehandles test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_filehandles_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_filehandles_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt @@ -65,7 +65,7 @@ test_filehandles_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LI check_PROGRAMS += test-config test_config_SOURCES = $(tests_srcdir)/lumiera/test-config.c test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_config_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_config_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_LTLIBRARIES += examplepluginc.la examplepluginc_la_SOURCES = $(tests_srcdir)/plugin/example_plugin.c @@ -75,17 +75,17 @@ examplepluginc_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/nul check_PROGRAMS += test-interfaces test_interfaces_SOURCES = $(tests_srcdir)/lumiera/test-interfaces.c test_interfaces_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_interfaces_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_interfaces_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt test_interfaces_DEPENDENCIES = examplepluginc.la liblumiera.la check_PROGRAMS += test-filemmap test_filemmap_SOURCES = $(tests_srcdir)/backend/test-filemmap.c test_filemmap_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_filemmap_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_filemmap_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-resourcecollector test_resourcecollector_SOURCES = $(tests_srcdir)/backend/test-resourcecollector.c test_resourcecollector_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_resourcecollector_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_resourcecollector_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt TESTS = $(tests_srcdir)/test.sh diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am index 8f36c36eb..2d589ccc9 100644 --- a/tests/components/Makefile.am +++ b/tests/components/Makefile.am @@ -22,14 +22,14 @@ check_PROGRAMS += test-components test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcomponents_srcdir) test_components_LDADD = \ - liblumieraproc.la \ + liblumieraproc.la \ liblumiprocengine.la \ liblumiprocmobjectbuilder.la \ liblumiprocmobjectsession.la \ liblumiprocasset.la \ liblumiprocmobject.la \ liblumierabackend.la \ - liblumieracommon.la \ + liblumieracommon.la \ liblumiera.la \ $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index da94d12f5..b1366bf3f 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -21,17 +21,17 @@ testlib_srcdir = $(top_srcdir)/tests/lib check_PROGRAMS += test-lib test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir) -test_lib_LDADD = \ - liblumiprocmobjectbuilder.la \ - liblumiprocmobjectsession.la \ - liblumiprocmobject.la \ - liblumiprocengine.la \ - liblumiproccontrol.la \ - liblumieraproc.la \ - liblumiprocasset.la \ - liblumierabackend.la \ - liblumieracommon.la \ - liblumiera.la \ +test_lib_LDADD = \ + liblumiprocmobjectbuilder.la \ + liblumiprocmobjectsession.la \ + liblumiprocmobject.la \ + liblumiprocengine.la \ + liblumiproccontrol.la \ + liblumieraproc.la \ + liblumiprocasset.la \ + liblumierabackend.la \ + liblumieracommon.la \ + liblumiera.la \ $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt test_lib_SOURCES = \