From 2fdea06f3dad020f438bb0010eda6de840b3b77e Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 18 May 2010 17:46:20 +0000
Subject: [PATCH] Moved xorriso implementation into libisoburn

---
 libisoburn/trunk/Makefile.am                  |  89 ++++----
 .../trunk/xorriso/makefile_libxorriso_am.txt  | 197 ------------------
 libisoburn/trunk/xorriso/xorriso_main.c       |  15 +-
 libisoburn/trunk/xorriso/xorriso_timestamp.h  |   2 +-
 4 files changed, 55 insertions(+), 248 deletions(-)
 delete mode 100644 libisoburn/trunk/xorriso/makefile_libxorriso_am.txt

diff --git a/libisoburn/trunk/Makefile.am b/libisoburn/trunk/Makefile.am
index 88e7c0d4..e4684c61 100644
--- a/libisoburn/trunk/Makefile.am
+++ b/libisoburn/trunk/Makefile.am
@@ -13,54 +13,15 @@ lib_LTLIBRARIES = libisoburn/libisoburn.la
 libisoburn_libisoburn_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 libisoburn_libisoburn_la_SOURCES = \
+	libisoburn/isoburn.h \
+	libisoburn/libisoburn.h \
 	libisoburn/burn_wrap.c \
 	libisoburn/data_source.c \
 	libisoburn/isoburn.c \
-	libisoburn/isoburn.h \
 	libisoburn/isofs_wrap.c \
-	libisoburn/libisoburn.h \
-	version.h
-
-libisoburn_libisoburn_la_LIBADD = \
-	-lisofs \
-	-lburn
-
-libinclude_HEADERS = \
-	libisoburn/libisoburn.h 
-
-## ========================================================================= ##
-
-
-# This is the reference application of libisoburn. See man xorriso/xorriso.1
-# 
-bin_PROGRAMS = \
-	xorriso/xorriso
-
-# This looks quite ugly with make install: xorriso.c is compiled twice again
-#
-# Trying to create a build timestamp file
-#
-# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
-#
-# phony targets get rebuilt every time
-#
-# .PHONY: xorriso/xorriso_buildstamp.h
-# xorriso/xorriso_buildstamp.h:
-# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
-# 	cat xorriso/xorriso_buildstamp.h
-
-xorriso_xorriso_CPPFLAGS = -Ilibisoburn
-xorriso_xorriso_CFLAGS = $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
-                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
-                         $(XORRISO_DVD_OBS_64K)
-
-xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
-		$(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
-
-xorriso_xorriso_SOURCES = \
+\
 	xorriso/xorriso.h \
 	xorriso/xorriso_private.h \
-	xorriso/xorriso_main.c \
 	xorriso/sfile.h \
 	xorriso/sfile.c \
 	xorriso/aux_objects.h \
@@ -110,7 +71,49 @@ xorriso_xorriso_SOURCES = \
 	xorriso/filters.h \
 	xorriso/filters.c \
 	xorriso/xorriso_timestamp.h \
-	xorriso/xorriso_buildstamp.h
+	xorriso/xorriso_buildstamp.h \
+	version.h
+
+libisoburn_libisoburn_la_LIBADD = \
+	-lisofs \
+	-lburn
+
+libinclude_HEADERS = \
+	libisoburn/libisoburn.h \
+	xorriso/xorriso.h
+
+## ========================================================================= ##
+
+
+# This is the reference application of libisoburn. See man xorriso/xorriso.1
+# 
+bin_PROGRAMS = \
+	xorriso/xorriso
+
+# This looks quite ugly with make install: xorriso.c is compiled twice again
+#
+# Trying to create a build timestamp file
+#
+# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
+#
+# phony targets get rebuilt every time
+#
+# .PHONY: xorriso/xorriso_buildstamp.h
+# xorriso/xorriso_buildstamp.h:
+# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+# 	cat xorriso/xorriso_buildstamp.h
+
+xorriso_xorriso_CPPFLAGS = -Ilibisoburn
+xorriso_xorriso_CFLAGS = $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
+                         $(XORRISO_DVD_OBS_64K)
+
+xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
+		$(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
+
+xorriso_xorriso_SOURCES = \
+	xorriso/xorriso.h \
+	xorriso/xorriso_main.c
 
 
 # Install symbolic links to the xorriso binary
diff --git a/libisoburn/trunk/xorriso/makefile_libxorriso_am.txt b/libisoburn/trunk/xorriso/makefile_libxorriso_am.txt
deleted file mode 100644
index f613876f..00000000
--- a/libisoburn/trunk/xorriso/makefile_libxorriso_am.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-
-# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
-# was: pkgconfigdir=$(libdir)/pkgconfig
-pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
-
-libincludedir=$(includedir)/libisoburn
-
-lib_LTLIBRARIES = libisoburn/libisoburn.la libxorriso/libxorriso.la
-
-## ========================================================================= ##
-
-# Build libraries
-libisoburn_libisoburn_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libisoburn_libisoburn_la_SOURCES = \
-	libisoburn/burn_wrap.c \
-	libisoburn/data_source.c \
-	libisoburn/isoburn.c \
-	libisoburn/isoburn.h \
-	libisoburn/isofs_wrap.c \
-	libisoburn/libisoburn.h \
-	version.h
-
-libisoburn_libisoburn_la_LIBADD = \
-	-lisofs \
-	-lburn
-
-libxorriso_libxorriso_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libxorriso_libxorriso_la_SOURCES = \
-	xorriso/xorriso.h \
-	xorriso/xorriso_private.h \
-	xorriso/xorriso.c \
-	xorriso/xorrisoburn.h \
-	xorriso/xorrisoburn.c \
-	xorriso/xorriso_timestamp.h \
-	xorriso/xorriso_buildstamp.h \
-	version.h
-
-libxorriso_libxorriso_la_LIBADD = \
-	-lisofs \
-	-lburn \
-	-lisoburn
-
-libinclude_HEADERS = \
-	libisoburn/libisoburn.h \
-	xorriso/xorriso.h
-
-## ========================================================================= ##
-
-
-# This is the reference application of libisoburn. See man xorriso/xorriso.1
-# 
-bin_PROGRAMS = \
-	xorriso/xorriso
-
-# This looks quite ugly with make install: xorriso.c is compiled twice again
-#
-# Trying to create a build timestamp file
-#
-# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
-#
-# phony targets get rebuilt every time
-#
-# .PHONY: xorriso/xorriso_buildstamp.h
-# xorriso/xorriso_buildstamp.h:
-# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
-# 	cat xorriso/xorriso_buildstamp.h
-
-xorriso_xorriso_CPPFLAGS = -Ilibisoburn
-xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_without_subS \
-                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
-                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
-                         $(XORRISO_DVD_OBS_64K)
-
-xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
-                        libxorriso/libxorriso.la \
-                        $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
-
-xorriso_xorriso_SOURCES = \
-	xorriso/xorriso.h \
-	xorriso/xorriso_private.h \
-	xorriso/xorriso.c \
-	xorriso/xorrisoburn.h \
-	xorriso/xorriso_timestamp.h \
-	xorriso/xorriso_buildstamp.h
-
-#	xorriso/xorrisoburn.c \
-#
-
-# Install symbolic links to the xorriso binary
-#
-install-exec-hook:
-	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
-	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
-	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
-	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
-	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
-	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
-
-
-# Alternative to the disabled .PHONY above.
-# Trying to create a build timestamp file semi-manually:  make buildstamped
-#
-buildstamp:
-	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
-	cat xorriso/xorriso_buildstamp.h
-
-# For now   make buildstamped  has to be performed explicitely.
-buildstamped: buildstamp
-	make
-
-
-
-## Build test applications
-noinst_PROGRAMS = \
-	test/compare_file
-
-# A program to compare two files in mirrored trees in mounted filesystems
-# To compare tree /media/dvd and /original/dir :
-#   find /media/dvd -exec test/compare_file '{}' /media/dvd /original/dir ';'
-#
-test_compare_file_CPPFLAGS =
-test_compare_file_CFLAGS =
-test_compare_file_LDADD =
-test_compare_file_SOURCES = test/compare_file.c
-
-
-## ========================================================================= ##
-
-## Build documentation (You need Doxygen for this to work)
-webhost = http://libburn-api.pykix.org
-webpath = /
-docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-
-doc:	doc/html
-
-doc/html: doc/doxygen.conf
-	if [ -f ./doc/doc.lock ]; then \
-		$(RM) -r doc/html; \
-		doxygen doc/doxygen.conf; \
-	fi
-
-doc-upload: doc/html
-	scp -r $</* $(webhost):$(webpath)
-
-all: doc
-
-install-data-local: 
-	if [ -f ./doc/doc.lock ]; then \
-		$(mkinstalldirs) $(docdir)/html; \
-		$(INSTALL_DATA) doc/html/* $(docdir)/html; \
-	fi
-
-uninstall-local:
-	rm -rf $(docdir)
-
-## ========================================================================= ##
-
-# Indent source files
-indent_files = \
-	$(libisoburn_libisoburn_la_SOURCES)
-	
-
-indent: $(indent_files)
-	indent -bad -bap -nbbb -nbbo -nbc -bli0 -br -bls   \
-		-cdw -ce -cli0 -ncs -nbfda -i8 -l79 -lc79   \
-		-lp -saf -sai -nprs -npsl -saw -sob -ss -ut \
-		-sbi0 -nsc -ts8 -npcs -ncdb -fca            \
-		$^
-
-.PHONY: indent
-
-## ========================================================================= ##
-
-# Extra things
-nodist_pkgconfig_DATA = \
-	libisoburn-1.pc
-
-man_MANS = xorriso/xorriso.1
-
-EXTRA_DIST = \
-	libisoburn-1.pc.in \
-	version.h.in \
-	doc/comments \
-	doc/doxygen.conf.in \
-	README \
-	AUTHORS \
-	CONTRIBUTORS \
-	COPYRIGHT \
-	COPYING \
-	INSTALL \
-	xorriso/changelog.txt \
-	xorriso/xorriso_buildstamp_none.h \
-	xorriso/README \
-	$(man_MANS)
-
diff --git a/libisoburn/trunk/xorriso/xorriso_main.c b/libisoburn/trunk/xorriso/xorriso_main.c
index a3e90bfa..b2cf8e6f 100644
--- a/libisoburn/trunk/xorriso/xorriso_main.c
+++ b/libisoburn/trunk/xorriso/xorriso_main.c
@@ -93,23 +93,24 @@
 
 #include <locale.h>
 
-/* The official xorriso options API. "No shortcuts" */
+
+/* xorriso_main.c includes the internal copy of the API definition */
+/* The official xorriso options API is defined in <xorriso/xorriso.h> */
 #include "xorriso.h"
 
 
+#ifdef Xorriso_standalonE
 
-#ifdef Xorriso_without_subS
+/* Make sure that both version tests always match. */
+#define Xorriso_main_program_versioN Xorriso_program_versioN
+
+#else /* Xorriso_standalonE */
 
 /* xorriso consists only of a main() stub which has an own version to match
    the version of libxorriso header and runtime code.
 */
 #define Xorriso_main_program_versioN "0.5.7"
 
-#else /* Xorriso_without_subS */
-
-/* Make sure that both version tests always match. */
-#define Xorriso_main_program_versioN Xorriso_program_versioN
-
 #endif /* ! Xorriso_without_subS */
 
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 1955edeb..70c3bf77 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.05.17.142656"
+#define Xorriso_timestamP "2010.05.18.174455"