From 5769690ad734cd2cd3e09aa89316c4e0219707c3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 5 May 2005 16:29:09 +0000 Subject: [PATCH] fix compile/link flags: canon camlib now (optionally) uses libexif git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7950 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/canon/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am index 43ef2c8e1..2281493bc 100644 --- a/camlibs/canon/Makefile.am +++ b/camlibs/canon/Makefile.am @@ -18,8 +18,9 @@ libgphoto2_canon_la_SOURCES = \ usb.c usb.h \ crc.c crc.h \ util.c util.h +libgphoto2_canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) libgphoto2_canon_la_LDFLAGS = -module -avoid-version -libgphoto2_canon_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +libgphoto2_canon_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la # "common" version: @@ -39,8 +40,9 @@ libcanon_la_SOURCES = \ usb.c usb.h \ crc.c crc.h \ util.c util.h +libcanon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) libcanon_la_LDFLAGS = $(CAMLIB_LDFLAGS) -libcanon_la_LIBADD = $(CAMLIB_LIBS) +libcanon_la_LIBADD = $(LIBEXIF_LIBS) $(CAMLIB_LIBS) # "ideal" version: @@ -59,8 +61,9 @@ canon_la_SOURCES = \ usb.c usb.h \ crc.c crc.h \ util.c util.h +canon_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) canon_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ -export-symbols $(top_srcdir)/camlibs/camlib.sym -canon_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la +canon_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la