From 3baaa886bec0ac5285292cfcb05d1dee71ec2ff1 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 4 Feb 2009 10:28:26 +0000 Subject: [PATCH] Linking with $LIBBURN_ARCH_LIBS to get -lcam on FreeBSD --- Makefile.am | 16 +++++++++------- cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 80b25d0..f37d9e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,32 +82,34 @@ noinst_PROGRAMS = \ bin_PROGRAMS = \ cdrskin/cdrskin +LIBBURN_EXTRALIBS = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS) + test_libburner_CPPFLAGS = -Ilibburn -test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS) test_libburner_SOURCES = test/libburner.c test_telltoc_CPPFLAGS = -Ilibburn -test_telltoc_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +test_telltoc_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS) test_telltoc_SOURCES = test/telltoc.c test_dewav_CPPFLAGS = -Ilibburn -test_dewav_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +test_dewav_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS) test_dewav_SOURCES = test/dewav.c test_fake_au_CPPFLAGS = test_fake_au_LDADD = test_fake_au_SOURCES = test/fake_au.c test_poll_CPPFLAGS = -Ilibburn -test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS) test_poll_SOURCES = test/poll.c test_structest_CPPFLAGS = -Ilibburn -test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS) test_structest_SOURCES = test/structest.c ## cdrskin construction site - ts A60816 - A90104 cdrskin_cdrskin_CPPFLAGS = -Ilibburn cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_6_1 -# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS) # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking -cdrskin_cdrskin_LDADD = libburn/libburn.la $(THREAD_LIBS) +cdrskin_cdrskin_LDADD = libburn/libburn.la $(LIBBURN_EXTRALIBS) cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h ## diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 468c97d..bdefc26 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.01.11.102711" +#define Cdrskin_timestamP "2009.02.04.102822"