From ae8f65e956dde56138dc794ea223f3ecaa74bfdb Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 17 Nov 2009 09:34:46 +0000
Subject: [PATCH] Revoked usage of libburn_libburn_la_CFLAGS in Makefile.am
 (ugly .o names)

---
 Makefile.am                 |  6 ++--
 cdrskin/cdrskin_timestamp.h |  2 +-
 cdrskin/compile_cdrskin.sh  |  6 +++-
 configure.ac                | 56 +++++++++++++++++++------------------
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d76a538..6ee8d43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ lib_LTLIBRARIES = libburn/libburn.la
 # Build libraries
 libburn_libburn_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libburn_libburn_la_CFLAGS = $(LIBBURN_DVD_OBS_64K)
+# This causes undesired .o names
+# configure.ac appends -D options to variable CFLAG
+### libburn_libburn_la_CFLAGS = $(LIBBURN_DVD_OBS_64K)
 libburn_libburn_la_LIBADD = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS)
 libburn_libburn_la_SOURCES = \
 	libburn/async.c \
@@ -114,7 +116,7 @@ test_structest_SOURCES = test/structest.c
 ##  cdrskin construction site - ts A60816 - A91012
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
 cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_7_3 \
-                         $(CDRSKIN_O_DIRECT_DEF) $(CDRSKIN_DVD_OBS_64K)
+                         $(CDRSKIN_O_DIRECT_DEF)
 
 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h
index ee60d31..e4af1fb 100644
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2009.11.16.165420"
+#define Cdrskin_timestamP "2009.11.17.093602"
diff --git a/cdrskin/compile_cdrskin.sh b/cdrskin/compile_cdrskin.sh
index 5137aff..8f63130 100755
--- a/cdrskin/compile_cdrskin.sh
+++ b/cdrskin/compile_cdrskin.sh
@@ -8,7 +8,11 @@ debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 libvers="-DCdrskin_libburn_0_7_3"
-burn="libburn/libburn_libburn_la-"
+
+# To be used if Makefile.am uses libburn_libburn_la_CFLAGS
+# burn="libburn/libburn_libburn_la-"
+burn="libburn/"
+
 cleanup_src_or_obj="$burn"cleanup.o
 libdax_msgs_o="$burn"libdax_msgs.o
 libdax_audioxtr_o="$burn"libdax_audioxtr.o
diff --git a/configure.ac b/configure.ac
index aed9586..7cbb927 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,35 @@ dnl If this would be done more specifically in Makefile.am
 dnl via libburn_libburn_la_CFLAGS then undesired .o file names would emerge
 CFLAGS="$CFLAGS $STATVFS_DEF"
 
+dnl ts A91116
+AC_ARG_ENABLE(cdrskin-fifo-odirect,
+[  --enable-cdrskin-fifo-odirect   Enable use of O_DIRECT with cdrskin fifo inlet, default=no],
+               , enable_cdrskin_fifo_odirect=no)
+if test x$enable_cdrskin_fifo_odirect = xyes; then
+    CDRSKIN_O_DIRECT_DEF="-DCdrskin_read_o_direcT"
+    echo "enabled  use of O_DIRECT with cdrskin fifo inlet"
+else
+    CDRSKIN_O_DIRECT_DEF=
+    echo "disabled use of O_DIRECT with cdrskin fifo inlet"
+fi
+AC_SUBST(CDRSKIN_O_DIRECT_DEF)
+
+dnl ts A91116
+AC_ARG_ENABLE(dvd-obs-64k,
+[  --enable-dvd-obs-64k            64 KB default size for DVD/BD writing, default=no],
+               , enable_fifo_odirect=no)
+if test x$enable_dvd_obs_64k = xyes; then
+    LIBBURN_DVD_OBS_64K="-DLibburn_dvd_obs_default_64K"
+    echo "enabled  write size default 64 KB on DVD and BD"
+else
+    LIBBURN_DVD_OBS_64K=
+    echo "disabled write size default 64 KB on DVD and BD"
+fi
+dnl Avoid the need for libburn_libburn_la_CFLAGS in Makefile.am (ugly .o names)
+dnl ### AC_SUBST(LIBBURN_DVD_OBS_64K)
+CFLAGS="$CFLAGS $LIBBURN_DVD_OBS_64K"
+
+
 dnl Add compiler-specific flags
 
 dnl See if the user wants aggressive optimizations of the code
@@ -198,33 +227,6 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
-# ts A91116
-AC_ARG_ENABLE(cdrskin-fifo-odirect,
-[  --enable-cdrskin-fifo-odirect   Enable use of O_DIRECT with cdrskin fifo inlet, default=no],
-               , enable_cdrskin_fifo_odirect=no)
-if test x$enable_cdrskin_fifo_odirect = xyes; then
-    CDRSKIN_O_DIRECT_DEF="-DCdrskin_read_o_direcT"
-    echo "enabled  use of O_DIRECT with cdrskin fifo inlet"
-else
-    CDRSKIN_O_DIRECT_DEF=
-    echo "disabled use of O_DIRECT with cdrskin fifo inlet"
-fi
-AC_SUBST(CDRSKIN_O_DIRECT_DEF)
-
-# ts A91116
-AC_ARG_ENABLE(dvd-obs-64k,
-[  --enable-dvd-obs-64k            64 KB default size for DVD/BD writing, default=no],
-               , enable_fifo_odirect=no)
-if test x$enable_dvd_obs_64k = xyes; then
-    LIBBURN_DVD_OBS_64K="-DLibburn_dvd_obs_default_64K"
-    echo "enabled  write size default 64 KB on DVD and BD"
-else
-    LIBBURN_DVD_OBS_64K=
-    echo "disabled write size default 64 KB on DVD and BD"
-fi
-AC_SUBST(LIBBURN_DVD_OBS_64K)
-
-
 dnl Determine target directory for libburn-*.pc
 dnl Important: Must be performed _after_ TARGET_SHIZZLE
 dnl