# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/aleksander/Development/gnu/libgnupdf\
#   /trunk/
# testament_sha1: 69434823cafdd23ca936d5cff256f098bc11a8ea
# timestamp: 2009-01-01 18:03:52 +0100
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'AUTHORS'
--- AUTHORS	2008-11-29 16:21:37 +0000
+++ AUTHORS	2009-01-01 17:00:46 +0000
@@ -244,4 +244,8 @@
   /src/base/pdf-crypt-c-v2.c
   /src/base/pdf-crypt-c-v2.h
   /src/base/pdf-crypt.h
-changed doc/gnupdf.texi
+and changed doc/gnupdf.texi
+
+Michael Gold: changed src/Makefile.am utils/Makefile.am
+  torture/unit/Makefile.am
+

=== modified file 'ChangeLog'
--- ChangeLog	2008-12-10 20:45:27 +0000
+++ ChangeLog	2009-01-01 17:00:46 +0000
@@ -1,3 +1,11 @@
+2009-01-01  Michael Gold  <address@hidden>
+
+	* utils/Makefile.am: Fix VPATH builds.
+
+	* torture/unit/Makefile.am: Idem.
+
+	* src/Makefile.am: Idem.
+
 2008-12-10  Jose E. Marchesi  <address@hidden>
 
 	* torture/unit/runtests.c (main): Dont set the CK_FORK variable,

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2008-11-30 20:15:05 +0000
+++ src/Makefile.am	2009-01-01 17:00:46 +0000
@@ -100,7 +100,7 @@
 endif
 
 include_HEADERS = pdf.h
-libgnupdf_la_LIBADD = $(top_srcdir)/lib/libgnu.la $(LIBGCRYPT_LIBS)
+libgnupdf_la_LIBADD = $(top_builddir)/lib/libgnu.la $(LIBGCRYPT_LIBS)
 # We want a DLL if compiling for Windows
 if COMPILE_W32_SYSTEM
   libgnupdf_la_LDFLAGS = -no-undefined
@@ -111,7 +111,7 @@
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-AM_CPPFLAGS = -I$(top_builddir)/lib -I$(srcdir)/base \
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(srcdir)/base \
               -I$(srcdir)/object -I$(srcdir)/document
 
 
@@ -135,11 +135,11 @@
               base/pdf-fp-func.h
 
 pdf.h : $(PUBLIC_HDRS)
-	chmod +x $(top_srcdir)/src/extract-public-hdr
-	cat header-autogen > $@
+	chmod +x $(top_builddir)/src/extract-public-hdr
+	cat $(srcdir)/header-autogen > $@
 	echo "#ifndef PDF_H" >> $@
 	echo "#define PDF_H" >> $@
-	cat $(PUBLIC_HDRS) | $(top_srcdir)/src/extract-public-hdr >> $@
+	cat $^ | $(top_builddir)/src/extract-public-hdr >> $@
 	echo "#endif /* !PDF_H */" >> $@
 	echo "/* end of pdf.h */" >> $@
 

=== modified file 'torture/unit/Makefile.am'
--- torture/unit/Makefile.am	2008-12-02 20:28:39 +0000
+++ torture/unit/Makefile.am	2009-01-01 17:00:46 +0000
@@ -43,7 +43,7 @@
 noinst_PROGRAMS = runtests
 
 LDADD = $(CHECK_LIBS) \
-        $(top_srcdir)/src/libgnupdf.la \
+        $(top_builddir)/src/libgnupdf.la \
         $(INTL_MACOSX_LIBS) \
         $(ICONV_LIBS)
 

=== modified file 'utils/Makefile.am'
--- utils/Makefile.am	2008-09-21 19:29:09 +0000
+++ utils/Makefile.am	2009-01-01 17:00:46 +0000
@@ -24,7 +24,7 @@
 
 bin_PROGRAMS = pdf-filter
 
-LDADD = $(top_srcdir)/src/libgnupdf.la \
+LDADD = $(top_builddir)/src/libgnupdf.la \
         $(ICONV_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/src/ \

# Begin bundle
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