From 0e6e90067a9f245778bfce78ca0f2922d8c753ea Mon Sep 17 00:00:00 2001
From: Martin Kretzschmar <mkretzschmar@src.gnome.org>
Date: Wed, 2 Apr 2003 17:54:27 +0000
Subject: [PATCH] add

* gpdf.applications: add

* Makefile.am install gpdf.applications

* gpdf.keys.in: update.

* goo/Makefile.am, shell/Makefile.am, xpdf/Makefile.am: add
top_srcdir to include path for aconf2.h.

* goo/Makefile.am, xpdf/Makefile.am: rename libgoo.a to libGoo.a
for consistency with Xpdf, don't install this library;
makefile.w32 is no more.

* README: added note that this does not describe the GNOME version.

* Makefile.am: don't distribute README.CVS, ANNOUNCE,
makefile.w32, distribute aconf2.h.

* CHANGES: added reference to ChangeLog and NEWS.

* AUTHORS, NEWS: updated.

* configure.in: add bugzilla url to AC_INIT.

* xpdf/gpdf-view.cc, xpdf/gpdf-persist-stream.cc,
xpdf/gpdf-control.cc, xpdf/GPOutputDev.cc: consistently wrap debug
messages.
---
 pdf/goo/Makefile.am  |  8 +++++---
 pdf/xpdf/Makefile.am | 16 ++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pdf/goo/Makefile.am b/pdf/goo/Makefile.am
index b08ca567..2e38b52f 100644
--- a/pdf/goo/Makefile.am
+++ b/pdf/goo/Makefile.am
@@ -1,6 +1,9 @@
-lib_LIBRARIES = libgoo.a
+INCLUDES =		\
+	-I$(top_srcdir)
 
-libgoo_a_SOURCES = 	\
+noinst_LIBRARIES = libGoo.a
+
+libGoo_a_SOURCES = 	\
 	GHash.cc	\
 	GHash.h		\
 	GList.cc	\
@@ -27,5 +30,4 @@ EXTRA_DIST = 		\
 	vms_unix_time.h	\
 	vms_unix_times.c\
 	vms_unlink.c	\
-	makefile.w32	\
 	vms_make.com
\ No newline at end of file
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 3e39038d..105d716f 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,5 +1,5 @@
-
 INCLUDES =							\
+	-I$(top_srcdir)						\
 	-I$(top_srcdir)/goo					\
 	-DDATADIR=\""$(datadir)"\"            			\
         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
@@ -151,7 +151,7 @@ gnome_pdf_viewer_SOURCES =		\
 # 	gpdf-embeddable-view.h
 
 gnome_pdf_viewer_LDADD =		\
-	$(top_builddir)/goo/libgoo.a	\
+	$(top_builddir)/goo/libGoo.a	\
 	$(EXTRA_GNOME_LIBS)		\
 	$(libpaper_LIBS)
 
@@ -175,7 +175,7 @@ xpdf_SOURCES =			\
 
 xpdf_CFLAGS = $(X_CFLAGS)
 xpdf_LDADD = 				\
-	$(top_builddir)/goo/libgoo.a 	\
+	$(top_builddir)/goo/libGoo.a 	\
 	-lXpm                           \
 	$(EXTRA_GNOME_LIBS) 		\
 	$(libpaper_LIBS)
@@ -186,23 +186,23 @@ xpdf_LDADD = 				\
 #	ImageOutputDev.h	
 #	pdfimages.cc
 
-#pdfimages_LDADD = ../goo/libgoo.a
+#pdfimages_LDADD = ../goo/libGoo.a
 #
 #pdftops_SOURCES =		
 #	$(common_sources)	
 #	PSOutputDev.cc		
 #       pdftops.cc
-#pdftops_LDADD = ../goo/libgoo.a
+#pdftops_LDADD = ../goo/libGoo.a
 
 #pdftotext_SOURCES =		
 #	$(common_sources)	
 #	pdftotext.cc
-#pdftotext_LDADD = ../goo/libgoo.a
+#pdftotext_LDADD = ../goo/libGoo.a
 
 #pdfinfo_SOURCES =		
 #	$(common_sources)	
 #	pdfinfo.cc
-#pdfinfo_LDADD = ../goo/libgoo.a
+#pdfinfo_LDADD = ../goo/libGoo.a
 
 #pdftopbm_SOURCES =		
 #	$(common_sources)	
@@ -213,7 +213,7 @@ xpdf_LDADD = 				\
 #	XOutputFontInfo.h	
 #	pdftopbm.cc
 
-#pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS)
+#pdftopbm_LDADD = ../goo/libGoo.a $(EXTRA_GNOME_LIBS)
 
 #bitmaps =		
 #	about.xbm		
-- 
2.43.5