diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 5aedc564e..c1352106a 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -101,6 +101,7 @@ lumigui_SOURCES = \ $(lumigui_srcdir)/output/xvdisplayer.cpp \ $(lumigui_srcdir)/output/xvdisplayer.hpp +# temporary Fix because of unresolved dependency problems regarding startup and core lumigui_SOURCES += \ $(lumiera_srcdir)/lumiera/guifacade.cpp \ $(lumiera_srcdir)/lumiera/configfacade.cpp \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index ac3a50d49..7ab58afe3 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -52,6 +52,8 @@ liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/query.cpp \ $(liblumiera_la_srcdir)/query/mockconfigrules.cpp \ $(liblumiera_la_srcdir)/streamtype.cpp \ + $(liblumiera_la_srcdir)/test/testoption.cpp \ + $(liblumiera_la_srcdir)/test/suite.cpp \ $(liblumiera_la_srcdir)/cmdline.cpp noinst_HEADERS += \ diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am index b3db1a817..87b644a6f 100644 --- a/src/tool/Makefile.am +++ b/src/tool/Makefile.am @@ -25,6 +25,7 @@ luidgen_CPPFLAGS = -I$(top_srcdir)/src/ \ luidgen_SOURCES = \ $(lumitool_srcdir)/luidgen.c +# temporary Fix because of unresolved dependency problems regarding startup and core luidgen_SOURCES += \ $(lumiera_srcdir)/lumiera/appstate.cpp \ $(lumiera_srcdir)/lumiera/configfacade.cpp \ @@ -32,4 +33,4 @@ luidgen_SOURCES += \ $(lumiera_srcdir)/lumiera/nobugcfg.cpp -luidgen_LDADD = liblumiera.la liblumieraproc.la -lboost_regex-mt -ldl $(NOBUGMT_LUMIERA_LIBS) +luidgen_LDADD = liblumiera.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl $(NOBUGMT_LUMIERA_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 625594866..dd8b19d46 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,45 +18,58 @@ tests_srcdir = $(top_srcdir)/tests +# temporary Fix because of unresolved dependency problems regarding startup and core +noinst_LTLIBRARIES += libtempfix.la +libtempfix_la_CXXFLAGS = $(CXXFLAGS) -Wall \ + -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" + +libtempfix_la_SOURCES = \ + $(lumiera_srcdir)/lumiera/appstate.cpp \ + $(lumiera_srcdir)/lumiera/configfacade.cpp \ + $(lumiera_srcdir)/lumiera/subsys.cpp \ + $(lumiera_srcdir)/lumiera/nobugcfg.cpp + + + 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.a $(NOBUGMT_LUMIERA_LIBS) +test_error_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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.a $(NOBUGMT_LUMIERA_LIBS) +test_locking_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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.a $(NOBUGMT_LUMIERA_LIBS) +test_llist_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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.a $(NOBUGMT_LUMIERA_LIBS) +test_psplay_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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.a $(NOBUGMT_LUMIERA_LIBS) +test_safeclib_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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.a $(NOBUGMT_LUMIERA_LIBS) +test_luid_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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 = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) +test_filedescriptors_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.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 = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) +test_filehandles_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt @@ -64,7 +77,7 @@ test_filehandles_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) 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 = liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) +test_config_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt check_LTLIBRARIES += examplepluginc.la examplepluginc_la_SOURCES = $(tests_srcdir)/plugin/example_plugin.c @@ -74,17 +87,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 = liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -test_interfaces_DEPENDENCIES = examplepluginc.la liblumieracore.a liblumiera.a +test_interfaces_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) libtempfix.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 = liblumibackend.a liblumiera.a -lnobugmt -lpthread -ldl -lm +test_filemmap_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm libtempfix.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 = liblumibackend.a liblumiera.a -lnobugmt -lpthread -ldl -lm +test_resourcecollector_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm libtempfix.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 98e7d5214..0285f1804 100644 --- a/tests/components/Makefile.am +++ b/tests/components/Makefile.am @@ -19,18 +19,18 @@ testcomponents_srcdir = $(top_srcdir)/tests/components check_PROGRAMS += test-components -test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcomponents_srcdir) +test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcomponents_srcdir) \ + -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" + test_components_LDADD = \ - liblumiproc.a \ - liblumiprocengine.a \ - liblumiprocmobjectbuilder.a \ - liblumiprocmobjectsession.a \ - liblumiprocasset.a \ - liblumiprocmobject.a \ - liblumicommon.a \ - liblumieracore.a \ - liblumibackend.a \ - liblumiera.a \ + liblumieraproc.la \ + liblumiprocengine.la \ + liblumiprocmobjectbuilder.la \ + liblumiprocmobjectsession.la \ + liblumiprocasset.la \ + liblumiprocmobject.la \ + liblumierabackend.la \ + liblumiera.la \ $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt test_components_SOURCES = \ @@ -64,6 +64,14 @@ test_components_SOURCES = \ $(testcomponents_srcdir)/proc/mobject/session/sessionstructuretest.cpp \ $(testcomponents_srcdir)/mainsuite.cpp +# temporary Fix because of unresolved dependency problems regarding startup and core +test_components_SOURCES += \ + $(lumiera_srcdir)/lumiera/appstate.cpp \ + $(lumiera_srcdir)/lumiera/configfacade.cpp \ + $(lumiera_srcdir)/lumiera/subsys.cpp \ + $(lumiera_srcdir)/lumiera/nobugcfg.cpp + + noinst_HEADERS += \ $(testcomponents_srcdir)/backend/mediaaccessmock.hpp \ $(testcomponents_srcdir)/proc/asset/testclipasset.hpp \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 473cd5e18..84a6cdf09 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -19,19 +19,19 @@ testlib_srcdir = $(top_srcdir)/tests/lib check_PROGRAMS += test-lib -test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir) +test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir) \ + -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" + test_lib_LDADD = \ - liblumiprocmobjectbuilder.a \ - liblumiprocmobjectsession.a \ - liblumiprocmobject.a \ - liblumiprocengine.a \ - liblumiproccontrol.a \ - liblumiproc.a \ - liblumiprocasset.a \ - liblumibackend.a \ - liblumicommon.a \ - liblumieracore.a \ - liblumiera.a \ + liblumiprocmobjectbuilder.la \ + liblumiprocmobjectsession.la \ + liblumiprocmobject.la \ + liblumiprocengine.la \ + liblumiproccontrol.la \ + liblumieraproc.la \ + liblumiprocasset.la \ + liblumierabackend.la \ + liblumiera.la \ $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt test_lib_SOURCES = \ @@ -65,6 +65,14 @@ test_lib_SOURCES = \ $(testlib_srcdir)/visitingtoolextendedtest.cpp \ $(testlib_srcdir)/visitingtooltest.cpp +# temporary Fix because of unresolved dependency problems regarding startup and core +test_lib_SOURCES += \ + $(lumiera_srcdir)/lumiera/appstate.cpp \ + $(lumiera_srcdir)/lumiera/configfacade.cpp \ + $(lumiera_srcdir)/lumiera/subsys.cpp \ + $(lumiera_srcdir)/lumiera/nobugcfg.cpp + + noinst_HEADERS += \ $(testlib_srcdir)/query/querydiagnostics.hpp \ $(testlib_srcdir)/testdummy.hpp \