benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Autotools adjustments

Browse source
This commit is contained in:
Fischlurch 2008-12-18 10:26:38 +01:00
parent 0314885834
commit 5f94b3ba68
6 changed files with 21 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -43,9 +43,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/ \
include $(top_srcdir)/admin/Makefile.am
# core
include $(top_srcdir)/src/proc/Makefile.am
include $(top_srcdir)/src/lib/Makefile.am
include $(top_srcdir)/src/proc/Makefile.am
include $(top_srcdir)/src/backend/Makefile.am
include $(top_srcdir)/src/common/Makefile.am
include $(top_srcdir)/src/lumiera/Makefile.am
# tools

14
src/gui/Makefile.am
View file

@ -24,7 +24,6 @@ lumigui_CPPFLAGS = $(AM_CPPFLAGS) \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" \
$(LUMIERA_GUI_CFLAGS)
bin_PROGRAMS += lumigui
@ -101,23 +100,14 @@ 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 \
$(lumiera_srcdir)/lumiera/appstate.cpp \
$(lumiera_srcdir)/lumiera/option.cpp \
$(lumiera_srcdir)/lumiera/subsys.cpp \
$(lumiera_srcdir)/lumiera/interfaceproxy.cpp \
$(lumiera_srcdir)/lumiera/nobugcfg.cpp
lumigui_LDFLAGS =
# $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
lumigui_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
lumigui_LDADD = liblumieracommon.la liblumierabackend.la liblumieraproc.la liblumiera.la \
$(LUMIERA_GUI_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
lumigui_DEPENDENCIES = \
$(top_builddir)/lumiera_ui.rc \
$(top_builddir)/liblumieracommon.la \
$(top_builddir)/liblumiera.la \
$(top_builddir)/liblumierabackend.la \
$(top_builddir)/liblumieraproc.la

2
src/lumiera/Makefile.am
View file

@ -20,7 +20,7 @@ lumiera_srcdir = $(top_srcdir)/src/lumiera
bin_PROGRAMS += lumiera
lumiera_CPPFLAGS = $(AM_CPPFLAGS)
lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
lumiera_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
lumiera_LDADD = liblumieracommon.la liblumierabackend.la liblumieraproc.la liblumiera.la \
$(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
lumiera_SOURCES = \

36
tests/Makefile.am
View file

@ -18,58 +18,46 @@
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.la $(NOBUGMT_LUMIERA_LIBS) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_error_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_locking_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_llist_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_psplay_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_safeclib_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_luid_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_filedescriptors_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_filehandles_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt
@ -77,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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_config_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt
check_LTLIBRARIES += examplepluginc.la
examplepluginc_la_SOURCES = $(tests_srcdir)/plugin/example_plugin.c
@ -87,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) libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_interfaces_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.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 libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_filemmap_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm liblumieracommon.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 libtempfix.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
test_resourcecollector_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm liblumieracommon.la -ldl -lboost_program_options-mt -lboost_regex-mt
TESTS = $(tests_srcdir)/test.sh

12
tests/components/Makefile.am
View file

@ -19,8 +19,7 @@
testcomponents_srcdir = $(top_srcdir)/tests/components
check_PROGRAMS += test-components
test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcomponents_srcdir) \
-DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcomponents_srcdir)
test_components_LDADD = \
liblumieraproc.la \
@ -30,6 +29,7 @@ test_components_LDADD = \
liblumiprocasset.la \
liblumiprocmobject.la \
liblumierabackend.la \
liblumieracommon.la \
liblumiera.la \
$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
@ -64,14 +64,6 @@ 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 \

12
tests/lib/Makefile.am
View file

@ -19,8 +19,7 @@
testlib_srcdir = $(top_srcdir)/tests/lib
check_PROGRAMS += test-lib
test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir) \
-DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir)
test_lib_LDADD = \
liblumiprocmobjectbuilder.la \
@ -31,6 +30,7 @@ test_lib_LDADD = \
liblumieraproc.la \
liblumiprocasset.la \
liblumierabackend.la \
liblumieracommon.la \
liblumiera.la \
$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
@ -65,14 +65,6 @@ 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 \