diff -urN udftools-cvs-20080518.orig/cdrwtool/Makefile.am udftools-cvs-20080518/cdrwtool/Makefile.am
--- udftools-cvs-20080518.orig/cdrwtool/Makefile.am	2004-02-27 01:45:50 +0200
+++ udftools-cvs-20080518/cdrwtool/Makefile.am	2008-05-19 02:52:53 +0300
@@ -1,5 +1,5 @@
 bin_PROGRAMS = cdrwtool
 cdrwtool_LDADD = $(top_builddir)/libudffs/libudffs.la
-cdrwtool_SOURCES = main.c options.c cdrwtool.c defaults.c ../mkudffs/mkudffs.c options.h cdrwtool.h ../include/ecma_167.h ../include/osta_udf.h ../mkudffs/mkudffs.h ../include/libudffs.h ../include/defaults.h ../include/udf_endian.h
+cdrwtool_SOURCES = main.c options.c cdrwtool.c ../mkudffs/mkudffs.c options.h cdrwtool.h ../include/ecma_167.h ../include/osta_udf.h ../mkudffs/mkudffs.h ../include/libudffs.h ../include/defaults.h ../include/udf_endian.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE
diff -urN udftools-cvs-20080518.orig/libudffs/Makefile.am udftools-cvs-20080518/libudffs/Makefile.am
--- udftools-cvs-20080518.orig/libudffs/Makefile.am	2004-02-27 01:45:50 +0200
+++ udftools-cvs-20080518/libudffs/Makefile.am	2008-05-19 02:52:20 +0300
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES     = libudffs.la
-libudffs_la_SOURCES = crc.c extent.c desc.c file.c unicode.c ../include/getopt.h ../include/libudffs.h ../include/ecma_167.h ../include/osta_udf.h ../include/defaults.h ../include/udf_endian.h ../include/bswap.h
+libudffs_la_SOURCES = crc.c extent.c ../mkudffs/defaults.c desc.c file.c unicode.c ../include/getopt.h ../include/libudffs.h ../include/ecma_167.h ../include/osta_udf.h ../include/defaults.h ../include/udf_endian.h ../include/bswap.h
 libudffs_la_LIBADD = @LTLIBOBJS@
 libudffs_la_LDFLAGS = -version-info 1:0:0
 
diff -urN udftools-cvs-20080518.orig/Makefile.am udftools-cvs-20080518/Makefile.am
--- udftools-cvs-20080518.orig/Makefile.am	2002-11-26 09:18:50 +0200
+++ udftools-cvs-20080518/Makefile.am	2008-05-19 02:38:31 +0300
@@ -1 +1 @@
-SUBDIRS = libudffs mkudffs cdrwtool pktsetup udffsck wrudf doc udfct
+SUBDIRS = libudffs mkudffs cdrwtool pktsetup wrudf doc udfct
diff -urN udftools-cvs-20080518.orig/mkudffs/Makefile.am udftools-cvs-20080518/mkudffs/Makefile.am
--- udftools-cvs-20080518.orig/mkudffs/Makefile.am	2004-02-27 01:45:50 +0200
+++ udftools-cvs-20080518/mkudffs/Makefile.am	2008-05-19 02:53:10 +0300
@@ -1,5 +1,5 @@
 bin_PROGRAMS = mkudffs
 mkudffs_LDADD = $(top_builddir)/libudffs/libudffs.la
-mkudffs_SOURCES = main.c mkudffs.c defaults.c options.c mkudffs.h options.h ../include/ecma_167.h ../include/osta_udf.h ../include/libudffs.h ../include/defaults.h ../include/udf_endian.h ../include/bswap.h
+mkudffs_SOURCES = main.c mkudffs.c options.c mkudffs.h options.h ../include/ecma_167.h ../include/osta_udf.h ../include/libudffs.h ../include/defaults.h ../include/udf_endian.h ../include/bswap.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE
diff -urN udftools-cvs-20080518.orig/wrudf/Makefile.am udftools-cvs-20080518/wrudf/Makefile.am
--- udftools-cvs-20080518.orig/wrudf/Makefile.am	2004-02-27 02:02:53 +0200
+++ udftools-cvs-20080518/wrudf/Makefile.am	2008-05-19 02:51:51 +0300
@@ -1,5 +1,5 @@
 bin_PROGRAMS = wrudf
 wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses
-wrudf_SOURCES = wrudf.c defaults.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
+wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG