[Dvd-devel] Patch for out of source tree builds - attached: dvdrtools-svn-srcdir-VPATH.patch

[Kelly Anderson]

Attached is a a patch to get out of source tree builds working cleanly.  
I find keeping my source tree and build tree separate to have lot's of 
advantages.
--- ./cdda2wav/Makefile.am.orig 2007-11-29 15:02:54.000000000 -0700
+++ ./cdda2wav/Makefile.am      2007-11-29 15:21:32.730780394 -0700
@@ -2,7 +2,7 @@ bin_PROGRAMS = cdda2wav
 
 bin_SCRIPTS = cdda2ogg cdda2mp3
 
-AM_CFLAGS = -DFIFO -I../dvdrecord -I../libscg -I../include -I.. $(CDDA2WAVDEFS)
+AM_CFLAGS = -DFIFO -I$(top_srcdir)/dvdrecord -I$(top_srcdir)/libscg 
-I$(top_srcdir)/include -I.. $(CDDA2WAVDEFS)
 
 cdda2wav_LDADD = -L../libscg -lscg -L../libschily -lschily
 
@@ -11,7 +11,7 @@ cdda2wav_SOURCES = cdda2wav.c interface.
                sndconfig.c scsi_cmds.c aiff.c aifc.c \
                ../dvdrecord/scsi_cdr.c ../dvdrecord/cd_misc.c \
                ../dvdrecord/modes.c ioctl.c \
-               sha_func.c base64.c
+               sha_func.c base64.c
 
 noinst_HEADERS = cdda2wav.h interface.h semshm.h global.h resample.h \
                mytype.h toc.h wav.h sun.h raw.h md5.h setuid.h ringbuff.h \
--- ./configure.ac.orig 2007-11-29 15:03:14.000000000 -0700
+++ ./configure.ac      2007-11-29 15:15:30.893662211 -0700
@@ -225,7 +225,7 @@ dnl ---- end stuff from cdrecord base --
 
 dnl ---- Make cdda2wav happy ----
 dnl extract cdrtools version from the cdrecord.c file
-CDRTOOLS_VERSION=`sed -nf version.sed <dvdrecord/cdrecord.c`
+CDRTOOLS_VERSION=`sed -nf version.sed <$ac_confdir/dvdrecord/cdrecord.c`
 AC_SUBST(CDRTOOLS_VERSION)
 
 AC_ARG_WITH(audio-format,
--- ./dvdrecord/Makefile.am.orig        2007-11-29 15:03:14.000000000 -0700
+++ ./dvdrecord/Makefile.am     2007-11-29 15:22:35.922771245 -0700
@@ -1,6 +1,6 @@
 bin_PROGRAMS = dvdrecord
 
-AM_CPPFLAGS = -DFIFO -DAUINFO -DUSE_LARGEFILES -I../include -I../libscg
+AM_CPPFLAGS = -DFIFO -DAUINFO -DUSE_LARGEFILES -I$(top_srcdir)/include 
-I$(top_srcdir)/libscg
 
 dvdrecord_SOURCES = cdrecord.c \
                cd_misc.c fifo.c isosize.c audiosize.c auinfo.c \
--- ./libdeflt/Makefile.am.orig 2007-11-29 15:02:49.000000000 -0700
+++ ./libdeflt/Makefile.am      2007-11-29 15:19:59.817646114 -0700
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I../include
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
 noinst_LIBRARIES = libdeflt.a
 
--- ./libhfs_iso/Makefile.am.orig       2007-11-29 15:02:44.000000000 -0700
+++ ./libhfs_iso/Makefile.am    2007-11-29 15:23:26.906646249 -0700
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libhfs.a
 
-INCLUDES = $(all_includes) -I../include
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
 AM_CFLAGS = -DAPPLE_HYB
 
--- ./librscg/Makefile.am.orig  2007-11-29 15:02:49.000000000 -0700
+++ ./librscg/Makefile.am       2007-11-29 15:24:11.597645428 -0700
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I../libscg -I../include
+INCLUDES = $(all_includes) -I$(top_srcdir)/libscg -I$(top_srcdir)/include
 
 noinst_LIBRARIES = librscg.a
 
--- ./libscg/Makefile.am.orig   2007-11-29 15:02:58.000000000 -0700
+++ ./libscg/Makefile.am        2007-11-29 15:24:48.230645685 -0700
@@ -1,4 +1,4 @@
-INCLUDES  = $(all_includes) -I../include
+INCLUDES  = $(all_includes) -I$(top_srcdir)/include
 
 noinst_LIBRARIES = libscg.a
 
--- ./libschily/Makefile.am.orig        2007-11-29 15:02:46.000000000 -0700
+++ ./libschily/Makefile.am     2007-11-29 15:25:26.973646224 -0700
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I../include
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
 noinst_LIBRARIES = libschily.a
 
--- ./libunls/Makefile.am.orig  2007-11-29 15:03:01.000000000 -0700
+++ ./libunls/Makefile.am       2007-11-29 15:26:04.394720321 -0700
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I../include
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
 
 noinst_LIBRARIES = libunls.a
 
--- ./mkisofs/Makefile.am.orig  2007-11-29 15:03:11.000000000 -0700
+++ ./mkisofs/Makefile.am       2007-11-29 15:27:19.765645612 -0700
@@ -2,7 +2,7 @@ SUBDIRS = diag
 
 bin_PROGRAMS = mkisofs
 
-INCLUDES = $(all_includes) -I../dvdrecord -I../include -I../libhfs_iso 
-I../libscg
+INCLUDES = $(all_includes) -I$(top_srcdir)/dvdrecord -I$(top_srcdir)/include 
-I$(top_srcdir)/libhfs_iso -I$(top_srcdir)/libscg
 
 AM_CFLAGS = -DADD_FILES -DUSE_LARGEFILES -DAPPLE_HYB -DUDF -DSORTING \
        -DHAVE_CONFIG_H -DUSE_SCG -DABORT_DEEP_ISO_ONLY \
--- ./mkisofs/diag/Makefile.am.orig     2007-11-29 15:03:11.000000000 -0700
+++ ./mkisofs/diag/Makefile.am  2007-11-29 15:36:38.519645715 -0700
@@ -1,21 +1,21 @@
 bin_PROGRAMS = devdump isodump isoinfo isovfy
 man_MANS = isoinfo.8
 
-INCLUDES = $(all_includes) -I../../libschily -I../../include
+INCLUDES = $(all_includes) -I$(top_srcdir)/libschily -I$(top_srcdir)/include
 AM_CFLAGS = -DUSE_LIBSCHILY -DUSE_LARGEFILES
 
 devdump_SOURCES = dump.c
 
-devdump_LDADD = -L../../libschily -lschily
+devdump_LDADD = -L$(top_builddir)/libschily -lschily
 
 isodump_SOURCES = isodump.c
 
-isodump_LDADD = -L../../libschily -lschily
+isodump_LDADD = -L$(top_builddir)/libschily -lschily
 
 isoinfo_SOURCES = isoinfo.c
 
-isoinfo_LDADD = -L../../libschily -lschily -L../../libunls -lunls
+isoinfo_LDADD = -L$(top_builddir)/libschily -lschily -L$(top_builddir)/libunls 
-lunls
 
 isovfy_SOURCES = isovfy.c
 
-isovfy_LDADD = -L../../libschily -lschily
+isovfy_LDADD = -L$(top_builddir)/libschily -lschily
--- ./readcd/Makefile.am.orig   2007-11-29 15:02:46.000000000 -0700
+++ ./readcd/Makefile.am        2007-11-29 15:34:08.409645821 -0700
@@ -1,12 +1,11 @@
-INCLUDES = $(all_includes) -I../dvdrecord -I../libschily -I../include 
-I../libscg
+VPATH = $(srcdir):$(top_srcdir)/dvdrecord
+INCLUDES = $(all_includes) -I$(top_srcdir)/dvdrecord -I$(top_srcdir)/libschily 
-I$(top_srcdir)/include -I$(top_srcdir)/libscg
 
 AM_CFLAGS = -DUSE_PG -DUSE_LARGEFILES
 
 bin_PROGRAMS = readcd
 man_MANS = readcd.1
 
-readcd_SOURCES =       readcd.c ../dvdrecord/cd_misc.c io.c \
-               ../dvdrecord/scsi_cdr.c \
-               ../dvdrecord/modes.c ../dvdrecord/misc.c
-
-readcd_LDADD = -L../librscg -lrscg -L../libscg -lscg -L../libschily -lschily 
$(SCSILIB) $(LIB_SOCKET)
+readcd_SOURCES = readcd.c io.c
+dvdrecord_objs = cd_misc.$(OBJEXT) scsi_cdr.$(OBJEXT) modes.$(OBJEXT) 
misc.$(OBJEXT)
+readcd_LDADD = $(dvdrecord_objs) -L../librscg -lrscg -L../libscg -lscg 
-L../libschily -lschily $(SCSILIB) $(LIB_SOCKET)