From 8ec25c1f4570aa6fcacc52cb66f6fc23f5e31162 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 27 Dec 2008 01:32:31 +0100 Subject: [PATCH] TEMPORARY hack: link against Gui libs to get gthread and glib ** please undo this change when we are ready to use our own thread service! --- src/lumiera/Makefile.am | 3 ++- tests/lib/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lumiera/Makefile.am b/src/lumiera/Makefile.am index 4a5488971..7085d32db 100644 --- a/src/lumiera/Makefile.am +++ b/src/lumiera/Makefile.am @@ -18,7 +18,7 @@ lumiera_srcdir = $(top_srcdir)/src/lumiera bin_PROGRAMS += lumiera -lumiera_CPPFLAGS = $(AM_CPPFLAGS) +lumiera_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror lumiera_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra @@ -28,6 +28,7 @@ lumiera_LDADD = \ liblumieraproc.la \ liblumiera.la \ $(LUMIERA_PLUGIN_LIBS) \ + $(LUMIERA_GUI_LIBS) \ $(NOBUGMT_LUMIERA_LIBS) \ -lboost_program_options-mt \ -lboost_regex-mt diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 9af145116..5be9d86fc 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -19,7 +19,7 @@ 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) $(LUMIERA_GUI_CFLAGS) test_lib_LDADD = \ liblumiprocmobjectbuilder.la \ @@ -32,6 +32,7 @@ test_lib_LDADD = \ liblumierabackend.la \ liblumieracommon.la \ liblumiera.la \ + $(LUMIERA_GUI_LIBS) \ $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt test_lib_SOURCES = \