Moved configuration options from xorriso_xorriso_CFLAGS to CFLAGS

Makefile.am

@@ -82,6 +82,10 @@ libinclude_HEADERS = \
 	libisoburn/libisoburn.h \
 	xorriso/xorriso.h
 
+# libisoburn_libisoburn_la_CFLAGS = $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+#                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
+#                         $(XORRISO_DVD_OBS_64K)
+
 ## ========================================================================= ##
 
 
@@ -104,9 +108,9 @@ bin_PROGRAMS = \
 # 	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_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)

configure.ac

@@ -295,6 +295,8 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
+CFLAGS="$CFLAGS $READLINE_DEF $LIBACL_DEF $XATTR_DEF $EXTF_DEF $EXTF_SUID_DEF $ZLIB_DEF $XORRISO_DVD_OBS_64K"
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/doxygen.conf

xorriso/compile_xorriso.sh

@@ -145,6 +145,11 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   "$xorr"/read_run.c \
   "$xorr"/filters.c \
   \
+  "$isoburn"/isoburn.c \
+  "$isoburn"/burn_wrap.c \
+  "$isoburn"/data_source.c \
+  "$isoburn"/isofs_wrap.c \
+  \
   "$burn"/async.o \
   "$burn"/debug.o \
   "$burn"/drive.o \
@@ -172,11 +177,6 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   "$burn"/crc.o \
   "$burn"/ecma130ab.o \
   \
-  "$isoburn"/isoburn.o \
-  "$isoburn"/burn_wrap.o \
-  "$isoburn"/data_source.o \
-  "$isoburn"/isofs_wrap.o \
-  \
   $libisofs \
   \
   $link_libreadline \

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2010.05.18.174455"
+#define Xorriso_timestamP "2010.05.19.160540"