From ec6c00a2606a92c36dc31d5b2a354ed43c7fc1d5 Mon Sep 17 00:00:00 2001 From: Lutz Mueller Date: Sat, 23 Feb 2002 16:35:11 +0000 Subject: [PATCH] =?UTF-8?q?2002-02-23=20=20Lutz=20M=EF=BF=BDller=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [serial,usb]/Makefile.am: LIBADD libgphoto2_port. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4208 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/ChangeLog | 4 ++++ libgphoto2_port/serial/Makefile.am | 4 +++- libgphoto2_port/usb/Makefile.am | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index fbe6889e4..32e93c1fc 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -1,3 +1,7 @@ +2002-02-23 Lutz Müller + + * [serial,usb]/Makefile.am: LIBADD libgphoto2_port. + 2002-02-22 Lutz Müller * serial/unix.c: Improved IRIX fix to set the speed exactly once after diff --git a/libgphoto2_port/serial/Makefile.am b/libgphoto2_port/serial/Makefile.am index 8fac5c944..6e1af1745 100644 --- a/libgphoto2_port/serial/Makefile.am +++ b/libgphoto2_port/serial/Makefile.am @@ -5,5 +5,7 @@ INCLUDES = -I$(top_srcdir)/libgphoto2_port ## Compile the IO library into a shared library iolibdir = $(libdir)/gphoto2_port/$(VERSION) iolib_LTLIBRARIES = libgphoto2_port_serial.la -libgphoto2_port_serial_la_LDFLAGS = -module -avoid-version $(SERIAL_LDFLAGS) +libgphoto2_port_serial_la_LDFLAGS = -module -avoid-version $(SERIAL_LDFLAGS) +libgphoto2_port_serial_la_LIBADD = \ + $(top_builddir)/libgphoto2_port/libgphoto2_port.la libgphoto2_port_serial_la_SOURCES = unix.c diff --git a/libgphoto2_port/usb/Makefile.am b/libgphoto2_port/usb/Makefile.am index d06010c60..81db2ec51 100644 --- a/libgphoto2_port/usb/Makefile.am +++ b/libgphoto2_port/usb/Makefile.am @@ -5,5 +5,6 @@ INCLUDES = -I$(top_srcdir)/libgphoto2_port $(USB_CFLAGS) iolibdir = $(libdir)/gphoto2_port/$(VERSION) iolib_LTLIBRARIES = libgphoto2_port_usb.la libgphoto2_port_usb_la_LDFLAGS = -module -avoid-version -libgphoto2_port_usb_la_LIBADD = $(USB_LIBS) +libgphoto2_port_usb_la_LIBADD = $(USB_LIBS) \ + $(top_builddir)/libgphoto2_port/libgphoto2_port.la libgphoto2_port_usb_la_SOURCES = libusb.c