Hi all, This patch fixes a few problems with VPATH builds where source files were assumed to be in the build tree or vice versa. Documentation still builds in the source tree, which seems standard for GNU projects.
-- Michael
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2008-10-05 15:08:05 +0000
+++ src/Makefile.am 2008-12-24 05:59:43 +0000
@@ -92,7 +92,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
@@ -103,7 +103,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
@@ -128,11 +128,11 @@
base/pdf-crypt-c-aesv2.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 'utils/Makefile.am'
--- utils/Makefile.am 2008-09-21 19:29:09 +0000
+++ utils/Makefile.am 2008-12-24 06:04:20 +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/ \
signature.asc
Description: Digital signature
