autoconf/automake cleanup

* refactor configure.ac to have distinct sections to configure each subsystem. * Dedicated LUMIERA_<subsys>_CFLAGS|_LIBS vars * Fix Makefile.am's to use them, remove unnecessary dependencies Stray dependencies to be refacored: * tests/Makefile.am has dependencies on proc and backend - should be moved to tests/library/Makefile.am etc anyways * tests/lib/Makefile.am has dependency on GUI left * src/tool/Makefile.am links GUI stuff generally, thats ok * one threading test is broken, we don't care, merging new threadpool in next.
2010-01-17 15:48:30 +01:00 · 2010-01-17 15:48:30 +01:00 · b8336879f7
commit b8336879f7
parent aea546554b
13 changed files with 212 additions and 134 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -36,8 +36,7 @@ CLEANFILES =
 # global pre-processor flags. Per-target variables should include
 # these at the front (if possible) for consistency
 AM_CPPFLAGS = -I$(top_srcdir)/src/ 	\
-	$(NOBUGMT_LUMIERA_CFLAGS)	\
-	$(VALGRIND_CFLAGS)
+		$(LUMIERA_CFLAGS)

 # Only use subdirs if really needed, prefer the include scheme below
 #SUBDIRS +=
--- a/configure.ac
+++ b/configure.ac
@ -7,8 +7,9 @@ AC_PREREQ(2.59)

 AC_COPYRIGHT([
  Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
+    2008, 2009, 2010    Christian Thaeter <ct@pipapo.org>
                        Joel Holdsworth <joel@airwebreathe.org.uk>
+                        et. al.

  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
@ -25,12 +26,14 @@ AC_COPYRIGHT([
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ])

+#################################################################################
 #
 # Global configuration
 #
 AC_GNU_SOURCE
 AC_DISABLE_STATIC

+#################################################################################
 #
 # Required programs
 #
@ -42,26 +45,12 @@ AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG([0.22])

-#
-# test for headers
-#
-AC_STDC_HEADERS
-
-ACX_PTHREAD
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
-
-##AM_CONDITIONAL([HAVE_THREADING], [test x"$acx_pthread_ok" = xyes])
-
-
-
+#################################################################################
 #
 # user options
 #

-
-############## NoBug build levels
+# NoBug build levels
 AH_TEMPLATE(EBUG_ALPHA, [Define to 1 for selecting NoBug ALPHA build level])
 AH_TEMPLATE(EBUG_BETA, [Define to 1 for selecting NoBug BETA build level])
 AH_TEMPLATE(NDEBUG, [Define to 1 for selecting NoBug RELEASE build level])
@ -83,18 +72,44 @@ AC_ARG_ENABLE(release, AC_HELP_STRING([--enable-release], [select NoBug RELEASE
 )])])
 # END NoBug

-# C headers and libraries
-AC_LANG_PUSH([C])

-AC_CHECK_LIB(dl, dlopen, [LUMIERA_PLUGIN_LIBS="$LUMIERA_PLUGIN_LIBS -ldl"],
-                   [AC_MSG_ERROR([Dynamic linking not supported, report a bug])]
+
+
+#################################################################################
+#
+# global test for headers and functions
+#
+AC_STDC_HEADERS
+
+
+ACX_PTHREAD
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CC="$PTHREAD_CC"
+
+# Nobug Dependencies
+AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H))
+PKG_CHECK_MODULES(VALGRIND, [valgrind], AC_DEFINE(HAVE_VALGRIND_H),
+                             AC_MSG_NOTICE([valgrind not found                                 (optional)]))
+
+PKG_CHECK_MODULES(NOBUGMT, [nobugmt >= 201001.1],
+			   AC_DEFINE(HAVE_NOBUGMT_H),
+			   AC_MSG_ERROR([Missing required nobug version                    (http://www.lumiera.org/nobug_manual.html)])
 )

-AC_LANG_POP([C])
+LUMIERA_CFLAGS="$NOBUGMT_CFLAGS $VALGRIND_CFLAGS"
+LUMIERA_LIBS="$NOBUGMT_LIBS"
+
+AC_SUBST(LUMIERA_CFLAGS)
+AC_SUBST(LUMIERA_LIBS)


+#boost
 # C++ headers and libraries
 AC_LANG_PUSH([C++])
+# check for the minimum Boost version
+# (http://www.randspringer.de/boost/upt.html)
+AX_BOOST_BASE([1.34.1])

 AC_CHECK_HEADER([tr1/memory],
        ,
@ -107,22 +122,87 @@ AC_CHECK_HEADER([boost/shared_ptr.hpp],
        )

 AC_CHECK_HEADER([boost/program_options.hpp],
-        ,
+        [LUMIERA_BOOST_LIBS="$LUMIERA_BOOST_LIBS -lboost_program_options-mt"],
        AC_MSG_ERROR([boost::program_options missing            (http://www.boost.org/)])
        )

-# check for the minimum Boost version
-# (http://www.randspringer.de/boost/upt.html)
-AX_BOOST_BASE([1.34.1])
-
 AC_CHECK_HEADER([boost/regex.hpp],
-        ,
+        [LUMIERA_BOOST_LIBS="$LUMIERA_BOOST_LIBS -lboost_regex-mt"],
        AC_MSG_ERROR([boost::regex missing                      (http://www.boost.org/)])
        )

 AC_LANG_POP([C++])
+AC_SUBST(LUMIERA_BOOST_CFLAGS)
+AC_SUBST(LUMIERA_BOOST_LIBS)

-PKG_CHECK_MODULES(LUMIERA_COMMON_LIBS, [sigc++-2.0 >= 2.0.17])
+
+
+#################################################################################
+#
+# Configs for subsystems
+# ----------------------
+#
+
+#################################################################################
+#
+# library
+#
+
+PKG_CHECK_MODULES(LUMIERA_LIBRARY, [
+    gavl >= 1.0.1
+    ])
+
+LUMIERA_LIBRARY_CFLAGS="$LUMIERA_LIBRARY_CFLAGS $LUMIERA_CFLAGS"
+LUMIERA_LIBRARY_LIBS="$LUMIERA_LIBRARY_CFLAGS $LUMIERA_LIBS $LUMIERA_BOOST_LIBS"
+
+AC_SUBST(LUMIERA_LIBRARY_CFLAGS)
+AC_SUBST(LUMIERA_LIBRARY_LIBS)
+
+#################################################################################
+#
+# common
+#
+PKG_CHECK_MODULES(LUMIERA_COMMON, [sigc++-2.0 >= 2.0.17])
+
+AC_LANG_PUSH([C])
+AC_CHECK_LIB(dl, dlopen, [LUMIERA_COMMON_LIBS="$LUMIERA_COMMON_LIBS -ldl"],
+                   [AC_MSG_ERROR([Dynamic linking not supported, report a bug])]
+)
+AC_LANG_POP([C])
+
+LUMIERA_COMMON_CFLAGS="$LUMIERA_COMMON_CFLAGS $LUMIERA_CFLAGS"
+LUMIERA_COMMON_LIBS="$LUMIERA_COMMON_LIBS $LUMIERA_LIBS"
+
+AC_SUBST(LUMIERA_COMMON_CFLAGS)
+AC_SUBST(LUMIERA_COMMON_LIBS)
+
+#################################################################################
+#
+# backend
+#
+
+LUMIERA_BACKEND_CFLAGS="$LUMIERA_CFLAGS"
+LUMIERA_BACKEND_LIBS="$LUMIERA_LIBS"
+
+AC_SUBST(LUMIERA_BACKEND_CFLAGS)
+AC_SUBST(LUMIERA_BACKEND_LIBS)
+
+#################################################################################
+#
+# proc
+#
+
+
+LUMIERA_PROC_CFLAGS="$LUMIERA_PROC_CFLAGS $LUMIERA_CFLAGS"
+LUMIERA_PROC_LIBS="$LUMIERA_PROC_CFLAGS $LUMIERA_LIBS"
+
+AC_SUBST(LUMIERA_PROC_CFLAGS)
+AC_SUBST(LUMIERA_PROC_LIBS)
+
+#################################################################################
+#
+# gui
+#

 ############## Internatinalization
 #GETTEXT_PACKAGE=gtk-lumiera
@ -143,14 +223,12 @@ PKG_CHECK_MODULES(LUMIERA_GUI, [
    gtkmm-2.4 >= 2.12
    cairomm-1.0 >= 0.6.0
    librsvg-2.0 >= 2.18.1
-    gavl >= 0.2.5
+    gavl >= 1.0.1
    gthread-2.0 >= 2.12.4])

 # Check for gdl-1.0 with a gdl-lum fallback
 PKG_CHECK_MODULES(GDL, gdl-1.0 >= 2.27.1, ,
    [PKG_CHECK_MODULES(GDL, gdl-lum >= 2.27.1) ])
-LUMIERA_GUI_CFLAGS="$LUMIERA_GUI_CFLAGS $GDL_CFLAGS"
-LUMIERA_GUI_LIBS="$LUMIERA_GUI_LIBS $GDL_LIBS"

 # END Gtk Dependancies

@ -178,21 +256,28 @@ AC_CHECK_LIB(Xv, XvQueryAdaptors, [LUMIERA_GUI_LIBS="$LUMIERA_GUI_LIBS -lXv"],

 # END X11 Dependancies

-AC_SUBST(LUMIERA_COMMON_LIBS)
-AC_SUBST(LUMIERA_PLUGIN_LIBS)
-AC_SUBST(LUMIERA_GUI_LIBS)
+LUMIERA_GUI_CFLAGS="$LUMIERA_GUI_CFLAGS $LUMIERA_CFLAGS $GDL_CFLAGS"
+LUMIERA_GUI_LIBS="$LUMIERA_GUI_LIBS $LUMIERA_LIBS $GDL_LIBS"
+
 AC_SUBST(LUMIERA_GUI_CFLAGS)
+AC_SUBST(LUMIERA_GUI_LIBS)

-############## Nobug Dependancies
-AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H))
-PKG_CHECK_MODULES(VALGRIND, [valgrind], AC_DEFINE(HAVE_VALGRIND_H),
-                             AC_MSG_NOTICE([valgrind not found                                 (optional)]))

-PKG_CHECK_MODULES(NOBUGMT_LUMIERA, [nobugmt >= 201001.1],
-				 AC_DEFINE(HAVE_NOBUGMT_H),
-				 AC_MSG_ERROR([Missing required nobug version                    (http://www.lumiera.org/nobug_manual.html)])
-)
-# END Nobug Dependancies
+#################################################################################
+#
+# tools
+#
+
+LUMIERA_TOOL_CFLAGS="$LUMIERA_TOOL_CFLAGS $LUMIERA_CFLAGS $LUMIERA_GUI_CFLAGS"
+LUMIERA_TOOL_LIBS="$LUMIERA_TOOL_CFLAGS $LUMIERA_LIBS $LUMIERA_BOOST_LIBS $LUMIERA_GUI_LIBS"
+
+AC_SUBST(LUMIERA_TOOL_CFLAGS)
+AC_SUBST(LUMIERA_TOOL_LIBS)
+
+#################################################################################
+#
+# Generate output
+#

 # Print a summary
 AC_MSG_RESULT([
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@ -19,8 +19,8 @@ liblumierabackend_la_srcdir = $(top_srcdir)/src/backend
 lib_LTLIBRARIES += liblumierabackend.la

 liblumierabackend_la_CPPFLAGS = $(AM_CPPFLAGS)
-liblumierabackend_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-liblumierabackend_la_LIBADD = liblumiera.la
+liblumierabackend_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_BACKEND_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+liblumierabackend_la_LIBADD = $(LUMIERA_BACKEND_LIBS) liblumiera.la

 liblumierabackend_la_SOURCES =					\
 	$(liblumierabackend_la_srcdir)/mediaaccessfacade.cpp	\
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@ -18,10 +18,13 @@
 liblumieracommon_la_srcdir = $(top_srcdir)/src/common
 lib_LTLIBRARIES += liblumieracommon.la

-liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS)  -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config:.\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/:./.libs\""
-liblumieracommon_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-liblumieracommon_la_CXXFLAGS = $(AM_CXXFLAGS) -Wextra -Wall
-liblumieracommon_la_LIBADD = liblumiera.la
+liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config:.\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/:./.libs\""
+liblumieracommon_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_COMMON_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+liblumieracommon_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_COMMON_CFLAGS) -Wextra -Wall
+liblumieracommon_la_LIBADD =		\
+	$(LUMIERA_COMMON_LIBS)		\
+	liblumiera.la
+

 liblumieracommon_la_SOURCES =						\
 	$(liblumieracommon_la_srcdir)/config.c				\
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@ -32,15 +32,15 @@ lumiera_ui.rc:
 #
 pkglib_LTLIBRARIES += gtk_gui.la

-gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-gtk_gui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+gtk_gui_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_GUI_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+gtk_gui_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_GUI_CFLAGS) -Wall -Wextra
 gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS)					\
 	$(LUMIERA_GUI_CFLAGS)						\
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\"				\
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
-	-DLUMIERA_PLUGIN -I$(top_srcdir)/src/				\
-	$(LUMIERA_GUI_CFLAGS)
+	-DLUMIERA_PLUGIN -I$(top_srcdir)/src/
+
 gtk_gui_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null -shrext .lum

 gtk_gui_la_LIBADD =		\
@ -48,8 +48,7 @@ gtk_gui_la_LIBADD =		\
 	liblumierabackend.la	\
 	liblumieracommon.la	\
 	liblumiera.la		\
-	$(LUMIERA_GUI_LIBS)	\
-	$(NOBUGMT_LUMIERA_LIBS)
+	$(LUMIERA_GUI_LIBS)

 gtk_gui_la_SOURCES =							\
 	$(lumigui_srcdir)/guistart.cpp					\
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@ -18,8 +18,19 @@
 liblumiera_la_srcdir = $(top_srcdir)/src/lib
 lib_LTLIBRARIES += liblumiera.la

-liblumiera_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiera_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiera_la_CFLAGS = 						\
+	$(AM_CFLAGS)						\
+	$(LUMIERA_LIBRARY_CFLAGS)				\
+	-std=gnu99 -Wall -Wextra -Werror
+
+liblumiera_la_CXXFLAGS =					\
+	$(AM_CXXFLAGS)						\
+	$(LUMIERA_LIBRARY_CFLAGS)				\
+	-Wall -Wextra
+
+liblumiera_la_LIBADD =	 					\
+	$(LUMIERA_LIBRARY_LIBS)
+

 liblumiera_la_SOURCES =						\
 	$(liblumiera_la_srcdir)/error.c				\
--- a/src/lumiera/Makefile.am
+++ b/src/lumiera/Makefile.am
@ -18,20 +18,16 @@
 lumiera_srcdir = $(top_srcdir)/src/lumiera

 bin_PROGRAMS += lumiera
-lumiera_CPPFLAGS = $(AM_CPPFLAGS)                                   	$(LUMIERA_GUI_CFLAGS)
-lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-lumiera_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+lumiera_CPPFLAGS = $(AM_CPPFLAGS)
+lumiera_CFLAGS = $(AM_CFLAGS) $(LUMIERA_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+lumiera_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_CFLAGS) -Wall -Wextra

 lumiera_LDADD =					\
+	$(LUMIERA_LIBS)				\
 	liblumieracommon.la			\
 	liblumierabackend.la			\
 	liblumieraproc.la			\
-	liblumiera.la				\
-	$(LUMIERA_PLUGIN_LIBS)			\
-	$(LUMIERA_GUI_LIBS)			\
-	$(NOBUGMT_LUMIERA_LIBS)			\
-	-lboost_program_options-mt		\
-	-lboost_regex-mt
+	liblumiera.la

 lumiera_SOURCES =				\
 	$(lumiera_srcdir)/main.cpp
--- a/src/proc/Makefile.am
+++ b/src/proc/Makefile.am
@ -21,8 +21,8 @@
 liblumiproc_la_srcdir = $(top_srcdir)/src/proc
 noinst_LTLIBRARIES += liblumiproc.la

-liblumiproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiproc_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiproc_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiproc_la_SOURCES =						\
 	$(liblumiproc_la_srcdir)/controllerfacade.cpp			\
@ -36,8 +36,8 @@ liblumiproc_la_SOURCES =						\
 liblumiprocasset_la_srcdir = $(top_srcdir)/src/proc/asset
 noinst_LTLIBRARIES += liblumiprocasset.la

-liblumiprocasset_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiprocasset_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiprocasset_la_SOURCES =				\
 	$(liblumiprocasset_la_srcdir)/codec.cpp		\
@ -61,8 +61,8 @@ liblumiprocasset_la_SOURCES =				\
 liblumiprocengine_la_srcdir = $(top_srcdir)/src/proc/engine
 noinst_LTLIBRARIES += liblumiprocengine.la

-liblumiprocengine_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiprocengine_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiprocengine_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiprocengine_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiprocengine_la_SOURCES =					\
 	$(liblumiprocengine_la_srcdir)/buffhandle.cpp		\
@ -84,8 +84,8 @@ liblumiprocengine_la_SOURCES =					\
 liblumiprocmobject_la_srcdir = $(top_srcdir)/src/proc/mobject
 noinst_LTLIBRARIES += liblumiprocmobject.la

-liblumiprocmobject_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiprocmobject_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiprocmobject_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiprocmobject_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiprocmobject_la_SOURCES =					\
 	$(liblumiprocmobject_la_srcdir)/builderfacade.cpp	\
@ -101,8 +101,8 @@ liblumiprocmobject_la_SOURCES =					\
 liblumiprocmobjectbuilder_la_srcdir = $(top_srcdir)/src/proc/mobject/builder
 noinst_LTLIBRARIES += liblumiprocmobjectbuilder.la

-liblumiprocmobjectbuilder_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiprocmobjectbuilder_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiprocmobjectbuilder_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiprocmobjectbuilder_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiprocmobjectbuilder_la_SOURCES =					\
 	$(liblumiprocmobjectbuilder_la_srcdir)/assembler.cpp		\
@ -115,8 +115,8 @@ liblumiprocmobjectbuilder_la_SOURCES =					\
 liblumiproccontrol_la_srcdir = $(top_srcdir)/src/proc/control
 noinst_LTLIBRARIES += liblumiproccontrol.la

-liblumiproccontrol_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiproccontrol_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiproccontrol_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiproccontrol_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiproccontrol_la_SOURCES =					\
 	$(liblumiproccontrol_la_srcdir)/command.cpp		\
@ -130,8 +130,8 @@ liblumiproccontrol_la_SOURCES =					\
 liblumiprocplay_la_srcdir = $(top_srcdir)/src/proc/play
 noinst_LTLIBRARIES += liblumiprocplay.la

-liblumiprocplay_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiprocplay_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiprocplay_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiprocplay_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiprocplay_la_SOURCES =					\
 	$(liblumiprocplay_la_srcdir)/dummy-player-service.cpp	\
@ -141,8 +141,8 @@ liblumiprocplay_la_SOURCES =					\
 liblumiprocmobjectsession_la_srcdir = $(top_srcdir)/src/proc/mobject/session
 noinst_LTLIBRARIES += liblumiprocmobjectsession.la

-liblumiprocmobjectsession_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumiprocmobjectsession_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumiprocmobjectsession_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumiprocmobjectsession_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumiprocmobjectsession_la_SOURCES =							\
 	$(liblumiprocmobjectsession_la_srcdir)/abstractmo.cpp				\
@ -265,12 +265,13 @@ noinst_HEADERS +=							\
 liblumieraproc_la_srcdir = $(top_srcdir)/src/proc
 lib_LTLIBRARIES += liblumieraproc.la

-liblumieraproc_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-liblumieraproc_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
+liblumieraproc_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
+liblumieraproc_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra

 liblumieraproc_la_SOURCES =

 liblumieraproc_la_LIBADD =			\
+	$(LUMIERA_PROC_LIBS)			\
 	liblumiproc.la				\
 	liblumiprocasset.la			\
 	liblumiprocengine.la			\
@ -279,4 +280,3 @@ liblumieraproc_la_LIBADD =			\
 	liblumiproccontrol.la			\
 	liblumiprocplay.la			\
 	liblumiprocmobjectsession.la
-
--- a/src/tool/Makefile.am
+++ b/src/tool/Makefile.am
@ -18,13 +18,13 @@
 lumitool_srcdir = $(top_srcdir)/src/tool

 noinst_PROGRAMS += luidgen
-luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
+luidgen_CFLAGS = $(CFLAGS) $(LUMIERA_TOOL_CFLAGS) -std=gnu99 -Wall -Werror
 luidgen_CPPFLAGS = -I$(top_srcdir)/src/
-luidgen_LDADD = liblumiera.la  $(NOBUGMT_LUMIERA_LIBS)    -lboost_regex-mt -lboost_program_options-mt
+luidgen_LDADD = liblumiera.la $(LUMIERA_TOOL_LIBS)
 luidgen_SOURCES = $(lumitool_srcdir)/luidgen.c


 noinst_PROGRAMS += rsvg-convert
-rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) -std=gnu99 -Wall -Werror
-rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2
+rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_TOOL_CFLAGS) -std=gnu99 -Wall -Werror
+rsvg_convert_LDADD = $(LUMIERA_TOOL_LIBS)
 rsvg_convert_SOURCES = $(lumitool_srcdir)/rsvg-convert.c
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -22,79 +22,71 @@ 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 = $(NOBUGMT_LUMIERA_LIBS)                                  liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_error_LDADD = $(LUMIERA_LIBS) liblumiera.la

 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 = $(NOBUGMT_LUMIERA_LIBS)                                liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_locking_LDADD = $(LUMIERA_LIBS) liblumiera.la

 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 = $(NOBUGMT_LUMIERA_LIBS)                                  liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_llist_LDADD = $(LUMIERA_LIBS) liblumiera.la

 check_PROGRAMS += test-mpool
 test_mpool_SOURCES = $(tests_srcdir)/library/test-mpool.c
 test_mpool_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_mpool_LDADD = $(NOBUGMT_LUMIERA_LIBS) \
-	liblumiera.la liblumieracommon.la liblumierabackend.la liblumieraproc.la -lboost_program_options-mt -lboost_regex-mt -ldl
+test_mpool_LDADD = $(LUMIERA_LIBS) liblumiera.la

 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 = $(NOBUGMT_LUMIERA_LIBS)                                 liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_psplay_LDADD = $(LUMIERA_LIBS) liblumiera.la

 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 = $(NOBUGMT_LUMIERA_LIBS)                               liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_safeclib_LDADD = $(LUMIERA_LIBS) liblumiera.la

 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 = $(NOBUGMT_LUMIERA_LIBS)                                   liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_luid_LDADD = $(LUMIERA_LIBS) liblumiera.la

 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 = $(NOBUGMT_LUMIERA_LIBS)   liblumierabackend.la liblumieracommon.la liblumieraproc.la -ldl liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_filedescriptors_LDADD = $(LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la
+# FIXME stray dependencies on proc

 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 = $(NOBUGMT_LUMIERA_LIBS)       liblumierabackend.la liblumieracommon.la liblumieraproc.la -ldl liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_filehandles_LDADD = $(LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la
+# FIXME stray dependencies on proc

 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
+test_filemmap_LDADD = $(LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la liblumieraproc.la
+# FIXME stray dependencies on proc

 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
+test_resourcecollector_LDADD = $(LUMIERA_LIBS) liblumiera.la

 check_PROGRAMS += test-slist
 test_slist_SOURCES = $(tests_srcdir)/library/test-slist.c
 test_slist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_slist_LDADD = $(NOBUGMT_LUMIERA_LIBS)                                  liblumiera.la -lboost_program_options-mt -lboost_regex-mt
+test_slist_LDADD = $(LUMIERA_LIBS) liblumiera.la

 check_PROGRAMS += test-config
 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)			\
-	$(NOBUGMT_LUMIERA_LIBS)			\
-	-ldl					\
-	-lboost_program_options-mt		\
-	-lboost_regex-mt
-
-
+test_config_LDADD = $(LUMIERA_LIBS) liblumieracommon.la	liblumieraproc.la liblumierabackend.la
+# FIXME stray dependencies on proc

 check_LTLIBRARIES += examplepluginc.la
 examplepluginc_la_SOURCES = $(tests_srcdir)/plugin/examplepluginc/example_plugin.c
@ -104,21 +96,13 @@ 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 = 			\
-	liblumieraproc.la			\
-	liblumierabackend.la			\
-	liblumieracommon.la			\
-	liblumiera.la				\
-	$(LUMIERA_PLUGIN_LIBS)			\
-	$(NOBUGMT_LUMIERA_LIBS)			\
-	-ldl					\
-	-lboost_program_options-mt		\
-	-lboost_regex-mt
+test_interfaces_LDADD =	$(LUMIERA_LIBS) liblumieracommon.la liblumierabackend.la liblumieraproc.la
+# FIXME stray dependency on backend, proc

 check_PROGRAMS += test-threads
 test_threads_SOURCES = $(tests_srcdir)/backend/test-threads.c
 test_threads_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
 test_threads_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-test_threads_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
+test_threads_LDADD = liblumierabackend.la liblumieracommon.la liblumieraproc.la

 TESTS = $(tests_srcdir)/test.sh
--- a/tests/components/Makefile.am
+++ b/tests/components/Makefile.am
@ -31,7 +31,7 @@ test_components_LDADD =								\
 	liblumierabackend.la							\
 	liblumieracommon.la  							\
 	liblumiera.la								\
-	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
+	$(LUMIERA_LIBS)

 test_components_SOURCES =								\
 	$(testcomponents_srcdir)/backend/mediaaccessmock.cpp				\
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@ -19,9 +19,12 @@
 testlib_srcdir = $(top_srcdir)/tests/lib

 check_PROGRAMS += test-lib
-test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir)                                   	$(LUMIERA_GUI_CFLAGS)
+test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir) $(LUMIERA_GUI_CFLAGS)
+#why gui cflags/libs?

 test_lib_LDADD =			\
+	$(LUMIERA_LIBRARY_LIBS)		\
+	$(LUMIERA_GUI_LIBS)		\
 	liblumiprocmobjectbuilder.la	\
 	liblumiprocmobjectsession.la	\
 	liblumiprocmobject.la		\
@ -31,9 +34,7 @@ test_lib_LDADD =			\
 	liblumiprocasset.la		\
 	liblumierabackend.la		\
 	liblumieracommon.la		\
-	liblumiera.la			\
-	$(LUMIERA_GUI_LIBS)			\
-	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
+	liblumiera.la

 test_lib_SOURCES =						\
 	$(testlib_srcdir)/mainsuite.cpp				\
--- 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 = $(NOBUGMT_LUMIERA_LIBS)  liblumieraproc.la liblumierabackend.la liblumieracommon.la liblumiera.la -lboost_regex-mt -lboost_program_options-mt -ldl
+vgsuppression_LDADD = $(LUMIERA_LIBS) liblumieraproc.la liblumierabackend.la liblumieracommon.la liblumiera.la -lboost_regex-mt -lboost_program_options-mt -ldl
 vgsuppression_SOURCES = $(lumitesttool_srcdir)/vgsuppression.c