From 3664ae290fe2fab6928fa6eb564291ba3fa73161 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 17 Oct 2007 03:02:57 +0000 Subject: [PATCH] Also link against $(LIBLTDL) if linking against libgphoto2.la git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10794 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/test/Makefile.am | 5 ++++- packaging/generic/Makefile.am | 1 + tests/Makefile.am | 5 +++++ tests/ddb/Makefile.am | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libgphoto2_port/test/Makefile.am b/libgphoto2_port/test/Makefile.am index 229dd346e..4ebd1e477 100644 --- a/libgphoto2_port/test/Makefile.am +++ b/libgphoto2_port/test/Makefile.am @@ -23,6 +23,9 @@ INSTALL_TESTS += test-port-list check_PROGRAMS += test-port-list test_port_list_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) $(CPPFLAGS) test_port_list_SOURCE = test-gp-port.c -test_port_list_LDFLAGS = $(top_builddir)/libgphoto2_port/libgphoto2_port.la $(LIBLTDL) $(INTLLIBS) +test_port_list_LDFLAGS = \ + $(top_builddir)/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ + $(INTLLIBS) include $(top_srcdir)/installcheck.mk diff --git a/packaging/generic/Makefile.am b/packaging/generic/Makefile.am index c37e36647..a8657ea42 100644 --- a/packaging/generic/Makefile.am +++ b/packaging/generic/Makefile.am @@ -6,4 +6,5 @@ print_camera_list_SOURCE = print-camera-list.c print_camera_list_LDADD = \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index a9d71a605..ae2b98b00 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,6 +28,7 @@ test_gphoto2_SOURCE = test-gphoto2.c test_gphoto2_LDADD = \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) \ $(INTLLIBS) @@ -36,6 +37,7 @@ test_filesys_SOURCE = test-filesys.c test_filesys_LDADD = \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) \ $(INTLLIBS) @@ -48,6 +50,7 @@ test_camera_list_SOURCE = test-camera-list.c test_camera_list_LDADD = \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) \ $(INTLLIBS) @@ -72,6 +75,7 @@ test_pedantic_c_CFLAGS = \ test_pedantic_c_LDADD = \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) \ $(INTLLIBS) @@ -92,6 +96,7 @@ test_pedantic_cxx_CXXFLAGS = \ test_pedantic_cxx_LDADD = \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) \ $(INTLLIBS) diff --git a/tests/ddb/Makefile.am b/tests/ddb/Makefile.am index f8a22eb84..c1140be7a 100644 --- a/tests/ddb/Makefile.am +++ b/tests/ddb/Makefile.am @@ -29,6 +29,7 @@ test_ddb_LDADD = \ -lfl \ $(top_builddir)/libgphoto2/libgphoto2.la \ $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la \ + $(LIBLTDL) \ $(LIBEXIF_LIBS) \ $(INTLLIBS)