From da2519ac34e95a27ab4601070868bdeb8403afb3 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 8 Feb 2009 20:13:19 +0100 Subject: [PATCH] fixed linking dependencies --- SConstruct | 4 ++-- src/gui/Makefile.am | 8 +++---- src/tool/Makefile.am | 2 +- src/tool/SConscript | 9 +++++--- tests/Makefile.am | 48 +++++++++++++++++++++++++----------------- tests/tool/Makefile.am | 2 +- 6 files changed, 43 insertions(+), 30 deletions(-) diff --git a/SConstruct b/SConstruct index 03df2a5c9..194c2df7e 100644 --- a/SConstruct +++ b/SConstruct @@ -351,7 +351,7 @@ def defineBuildTargets(env, artifacts): # the Lumiera GTK GUI envGtk = env.Clone() - envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','librsvg-2.0','xv','xext','sm']) + envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','xv','xext','sm']) envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core) objgui = srcSubtree(envGtk,'$SRCDIR/gui') @@ -362,7 +362,7 @@ def defineBuildTargets(env, artifacts): ) # call subdir SConscript(s) for independent components - SConscript(dirs=[SRCDIR+'/tool'], exports='env envGtk artifacts core') + SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts core') SConscript(dirs=[TESTDIR], exports='env envPlu artifacts core') diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 166744b2a..427375ad8 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) Lumiera.org -# 2007, Joel Holdsworth +# Copyright (C) Lumiera.org +# 2007, Joel Holdsworth # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -44,9 +44,9 @@ gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) \ gtk_gui_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null -shrext .lum gtk_gui_la_LIBADD = \ - liblumieracommon.la \ - liblumierabackend.la \ liblumieraproc.la \ + liblumierabackend.la \ + liblumieracommon.la \ liblumiera.la \ $(LUMIERA_GUI_LIBS) \ $(NOBUGMT_LUMIERA_LIBS) diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am index 4f6d14b6e..2bf1acf99 100644 --- a/src/tool/Makefile.am +++ b/src/tool/Makefile.am @@ -20,7 +20,7 @@ lumitool_srcdir = $(top_srcdir)/src/tool noinst_PROGRAMS += luidgen luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror luidgen_CPPFLAGS = -I$(top_srcdir)/src/ -luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl +luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -lboost_regex-mt -lboost_program_options-mt luidgen_SOURCES = $(lumitool_srcdir)/luidgen.c diff --git a/src/tool/SConscript b/src/tool/SConscript index bea1305ed..ca3f99211 100644 --- a/src/tool/SConscript +++ b/src/tool/SConscript @@ -3,14 +3,17 @@ ## SConscript - SCons buildscript for tool subdirectory (called by SConstruct) ## -Import('env','envGtk','artifacts','core') +Import('env','artifacts','core') support_lib = artifacts['support'] -luidgen = env.Program('#$BINDIR/luidgen', 'luidgen.c', LIBS=support_lib) ## for rendering SVG icons (uses librsvg) +envSvg = env.Clone() +envSvg.mergeConf(['librsvg-2.0']) +envSvg.Append(LIBS=support_lib) -rsvg = envGtk.Program('#$BINDIR/rsvg-convert','rsvg-convert.c') +luidgen = env.Program('#$BINDIR/luidgen', 'luidgen.c', LIBS=support_lib) ## for generating Lumiera-UIDs +rsvg = envSvg.Program('#$BINDIR/rsvg-convert','rsvg-convert.c') ## for rendering SVG icons (uses librsvg) # build additional test and administrative tools.... artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c') #### hello world (checks C build) diff --git a/tests/Makefile.am b/tests/Makefile.am index 750acb887..acaf205b6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,42 +22,52 @@ tests_srcdir = $(top_srcdir)/tests check_PROGRAMS += test-error test_error_SOURCES = $(tests_srcdir)/library/test-error.c test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_error_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_error_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_locking_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_llist_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_psplay_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_safeclib_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_luid_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_filedescriptors_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la -ldl liblumiera.la -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_filehandles_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la -ldl liblumiera.la -lboost_program_options-mt -lboost_regex-mt + +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 = $(NOBUGMT_LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la -ldl liblumiera.la -lboost_program_options-mt -lboost_regex-mt + +check_PROGRAMS += test-resourcecollector +test_resourcecollector_SOURCES = $(tests_srcdir)/library/test-resourcecollector.c +test_resourcecollector_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ +test_resourcecollector_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la -ldl liblumiera.la -lboost_program_options-mt -lboost_regex-mt check_PROGRAMS += test-config @@ -65,6 +75,7 @@ test_config_SOURCES = $(tests_srcdir)/common/test-config.c test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ test_config_LDADD = \ liblumieraproc.la \ + liblumierabackend.la \ liblumieracommon.la \ liblumiera.la \ $(LUMIERA_PLUGIN_LIBS) \ @@ -83,16 +94,15 @@ examplepluginc_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/nul check_PROGRAMS += test-interfaces test_interfaces_SOURCES = $(tests_srcdir)/common/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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt - -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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt - -check_PROGRAMS += test-resourcecollector -test_resourcecollector_SOURCES = $(tests_srcdir)/library/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 liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt +test_interfaces_LDADD = \ + liblumieraproc.la \ + liblumierabackend.la \ + liblumieracommon.la \ + liblumiera.la \ + $(LUMIERA_PLUGIN_LIBS) \ + $(NOBUGMT_LUMIERA_LIBS) \ + -ldl \ + -lboost_program_options-mt \ + -lboost_regex-mt TESTS = $(tests_srcdir)/test.sh diff --git a/tests/tool/Makefile.am b/tests/tool/Makefile.am index be9f5b5ef..7cd7e7e6b 100644 --- a/tests/tool/Makefile.am +++ b/tests/tool/Makefile.am @@ -19,6 +19,6 @@ lumitesttool_srcdir = $(top_srcdir)/tests/tool noinst_PROGRAMS += vgsuppression 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 +vgsuppression_LDADD = $(NOBUGMT_LUMIERA_LIBS) liblumieraproc.la liblumierabackend.la liblumieracommon.la liblumiera.la -lboost_regex-mt -lboost_program_options-mt -ldl vgsuppression_SOURCES = $(lumitesttool_srcdir)/vgsuppression.c