ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Autotools fixes (make the tests compile)

Browse source
This commit is contained in:
Fischlurch 2008-12-18 10:48:50 +01:00
parent fb72d20812
commit e32194b810
5 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
admin/Makefile.am
View file

@ -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

4
src/common/Makefile.am
View file

@ -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 \

24
tests/Makefile.am
View file

@ -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

4
tests/components/Makefile.am
View file

@ -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

22
tests/lib/Makefile.am
View file

@ -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 = \