From f80da306b5d03708bb76ccd87a3178df7e24ceef Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 23 Jan 2008 21:37:26 +0000 Subject: [PATCH] Dynamic cdrskin linking patch by Simon Huggins. --- libburn/trunk/Makefile.am | 6 +++++- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libburn/trunk/Makefile.am b/libburn/trunk/Makefile.am index 0a8ddad2..752298a8 100644 --- a/libburn/trunk/Makefile.am +++ b/libburn/trunk/Makefile.am @@ -104,7 +104,11 @@ test_structest_SOURCES = test/structest.c ## cdrskin construction site - ts A60816 - A71025 cdrskin_cdrskin_CPPFLAGS = -Ilibburn cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_4_1 -cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) + +# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS) +# ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking +cdrskin_cdrskin_LDADD = libburn/libburn.la $(THREAD_LIBS) + cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h ## ## Open questions: how to compute $timestamp and express -DX="$timestamp" diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 993f03c1..aa04920e 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2008.01.23.211731" +#define Cdrskin_timestamP "2008.01.23.213607"