diff --git a/admin/Makefile.am b/admin/Makefile.am index da1c244a7..9160c34ee 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -24,5 +24,5 @@ vgsuppression_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl noinst_PROGRAMS += rsvg-convert rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c -rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_LUMIERA_CFLAGS) -std=gnu99 -Wall -Werror +rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) -std=gnu99 -Wall -Werror rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2 diff --git a/configure.ac b/configure.ac index 4df50f245..6aafc1a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -124,15 +124,19 @@ AC_LANG_POP([C++]) # END Internatinalization +############## Gtk Dependancies +PKG_CHECK_MODULES(LUMIERA_GUI, [ + gtkmm-2.4 >= 2.8 gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0 + gavl >= 0.2.5 librsvg-2.0 >= 2.18.1]) + +# END Gtk Dependancies ############## X11 Dependancies AC_PATH_X AC_PATH_XTRA -# CFLAGS="$CFLAGS $X_CFLAGS" -LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],[], - [AC_MSG_ERROR([Xlib.h or Xutil.h not found install xdevel])]) + [AC_MSG_ERROR([Xlib.h or Xutil.h not found install xdevel])]) AC_CHECK_HEADERS([sys/ipc.h sys/shm.h],, [AC_MSG_ERROR([Required header not found. Please check that it is installed])] @@ -142,25 +146,18 @@ AC_CHECK_HEADERS([X11/extensions/Xvlib.h X11/extensions/XShm.h],, [#include ] ) -AC_CHECK_LIB(Xext, XInitExtension, , - [AC_MSG_ERROR([Could not link with libXext. Check that you have libXext installed])], -lX11 +AC_CHECK_LIB(Xext, XInitExtension, [LUMIERA_GUI_LIBS="$LUMIERA_GUI_LIBS -lXext"], + [AC_MSG_ERROR([Could not link with libXext. Check that you have libXext installed])], -lX11 ) -AC_CHECK_LIB(Xv, XvQueryAdaptors, , - [AC_MSG_ERROR([Could not link with libXv. Check that you have libXv installed])] +AC_CHECK_LIB(Xv, XvQueryAdaptors, [LUMIERA_GUI_LIBS="$LUMIERA_GUI_LIBS -lXv"], + [AC_MSG_ERROR([Could not link with libXv. Check that you have libXv installed])] ) # END X11 Dependancies -############## Gtk Dependancies -PKG_CHECK_MODULES(GTK_LUMIERA, [ - gtkmm-2.4 >= 2.8 gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0 - gavl >= 0.2.5 librsvg-2.0 >= 2.18.1]) - -AC_SUBST(GTK_LUMIERA_CFLAGS) -AC_SUBST(GTK_LUMIERA_LIBS) - -# END Gtk Dependancies +AC_SUBST(LUMIERA_GUI_CFLAGS) +AC_SUBST(LUMIERA_GUI_LIBS) ############## Nobug Dependancies diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 316887403..928f42a9b 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -24,7 +24,7 @@ lumigui_CPPFLAGS = $(AM_CPPFLAGS) \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - $(GTK_LUMIERA_CFLAGS) + $(LUMIERA_GUI_CFLAGS) bin_PROGRAMS += lumigui @@ -76,14 +76,15 @@ lumigui_SOURCES = \ $(lumigui_srcdir)/output/xvdisplayer.cpp \ $(lumigui_srcdir)/output/xvdisplayer.hpp -lumigui_LDFLAGS = -lumigui_LDADD = $(GTK_LUMIERA_LIBS) liblumicommon.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) +lumigui_LDFLAGS = +# $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) +lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumicommon.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) lumigui_DEPENDENCIES = \ $(top_builddir)/lumiera_ui.rc \ $(top_builddir)/liblumicommon.a \ $(top_builddir)/liblumiera.a - + $(top_builddir)/lumiera_ui.rc: cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir) diff --git a/tests/Makefile.am b/tests/Makefile.am index 10cdeed10..5554c0dc3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,51 +21,51 @@ 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.a $(NOBUGMT_LUMIERA_LIBS) -ldl +test_error_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) 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) -ldl -lm +test_locking_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm 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) -ldl -lm +test_llist_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm 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) -ldl -lm +test_psplay_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm 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) -ldl -lm +test_safeclib_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm 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) -ldl -lm +test_luid_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm check_PROGRAMS += test-interfaces test_interfaces_SOURCES = $(tests_srcdir)/backend/test-interfaces.c test_interfaces_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_interfaces_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm +test_interfaces_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm 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) -ldl -lm +test_filedescriptors_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm 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) -ldl -lm +test_filehandles_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm check_PROGRAMS += test-config test_config_SOURCES = $(tests_srcdir)/backend/test-config.c test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_config_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm +test_config_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -lm TESTS = $(tests_srcdir)/test.sh