X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2FMakefile.in;h=dc96dadfebb2f73e56c94c16dee63809e7be8e2e;hb=bd7dce23fec36adeb1713c164d594bbc0436b346;hp=5fcc4fe3fa0ccccf2e437e5e19736e18cfa40751;hpb=c938a769732fdede265c37a10bca744889a33eb9;p=evince.git

diff --git a/pdf/xpdf/Makefile.in b/pdf/xpdf/Makefile.in
index 5fcc4fe3..dc96dadf 100644
--- a/pdf/xpdf/Makefile.in
+++ b/pdf/xpdf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -96,6 +97,7 @@ PACKAGE = @PACKAGE@
 PTHREAD_LIB = @PTHREAD_LIB@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 XPM_LIBS = @XPM_LIBS@
 YACC = @YACC@
@@ -110,22 +112,22 @@ INCLUDES =  	-I$(top_srcdir)/goo		-I$(top_srcdir)/ltk		-DGPDF_GLADE_DIR=\""$(gla
 
 bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui)
 
-common_sources =  	Array.cc 			Catalog.cc 			Dict.cc 			Error.cc 			Gfx.cc 				GfxFont.cc 			GfxState.cc			Lexer.cc 			Link.cc 			Object.cc 			OutputDev.cc 			Page.cc 			Params.cc 			Parser.cc 			PDFDoc.cc 			Stream.cc 			XRef.cc
+common_sources =  	Array.cc 			Catalog.cc 			Dict.cc 			Error.cc 			Gfx.cc 				GfxFont.cc 			GfxState.cc			Lexer.cc 			Link.cc 			Object.cc 			OutputDev.cc 			Page.cc 			Params.cc 			Parser.cc 			PDFDoc.cc 			Stream.cc 			TextOutputDev.cc		XRef.cc
 
 
 gpdf_CFLAGS = 
 
-gpdf_SOURCES =  	$(common_sources)		TextOutputDev.cc		GOutputDev.cc			gpdf.cc
+gpdf_SOURCES =  	$(common_sources)		GOutputDev.cc			gpdf.cc
 
 
 gpdf_LDADD =  	$(EXTRA_GNOME_LIBS)		../goo/libgoo.a
 
 
-xpdf_SOURCES =  	$(common_sources)		XOutputDev.cc
+xpdf_SOURCES =  	$(common_sources)		XOutputDev.cc			LTKOutputDev.cc			PSOutputDev.cc			xpdf.cc
 
 
 xpdf_CFLAGS = $(X_CFLAGS)
-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a $(X_EXTRA_LIBS)
+xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) 
 
 pdfimages_SOURCES =  	$(common_sources)		ImageOutputDev.cc		pdfimages.cc
 
@@ -136,7 +138,7 @@ pdftops_SOURCES =  	$(common_sources)		PSOutputDev.cc			pdftops.cc
 
 pdftops_LDADD = ../goo/libgoo.a
 
-pdftotext_SOURCES =  	$(common_sources)		TextOutputDev.cc		pdftotext.cc
+pdftotext_SOURCES =  	$(common_sources)		pdftotext.cc
 
 pdftotext_LDADD = ../goo/libgoo.a
 
@@ -144,9 +146,10 @@ pdfinfo_SOURCES =  	$(common_sources)		pdfinfo.cc
 
 pdfinfo_LDADD = ../goo/libgoo.a
 
-pdftopbm_SOURCES =  	$(common_sources)		XOutputDev.cc			pdftopbm.cc
+pdftopbm_SOURCES =  	$(common_sources)		PBMOutputDev.cc			XOutputDev.cc			pdftopbm.cc
 
-pdftopbm_LDADD = ../goo/libgoo.a
+
+pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS)
 
 bitmaps =  	about.xbm			dblLeftArrow.xbm		dblRightArrow.xbm		find.xbm			leftArrow.xbm			postscript.xbm			rightArrow.xbm			xpdfIcon.xpm			zoomIn.xbm			zoomOut.xbm		
 
@@ -175,37 +178,39 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 pdftops_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o PSOutputDev.o pdftops.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o PSOutputDev.o pdftops.o
 pdftops_DEPENDENCIES =  ../goo/libgoo.a
 pdftops_LDFLAGS = 
 pdftotext_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o TextOutputDev.o pdftotext.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o pdftotext.o
 pdftotext_DEPENDENCIES =  ../goo/libgoo.a
 pdftotext_LDFLAGS = 
 pdfinfo_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o pdfinfo.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o pdfinfo.o
 pdfinfo_DEPENDENCIES =  ../goo/libgoo.a
 pdfinfo_LDFLAGS = 
 pdftopbm_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o XOutputDev.o pdftopbm.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o PBMOutputDev.o XOutputDev.o \
+pdftopbm.o
 pdftopbm_DEPENDENCIES =  ../goo/libgoo.a
 pdftopbm_LDFLAGS = 
 pdfimages_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o ImageOutputDev.o pdfimages.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o ImageOutputDev.o pdfimages.o
 pdfimages_DEPENDENCIES =  ../goo/libgoo.a
 pdfimages_LDFLAGS = 
 gpdf_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o TextOutputDev.o GOutputDev.o gpdf.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o GOutputDev.o gpdf.o
 gpdf_DEPENDENCIES =  ../goo/libgoo.a
 gpdf_LDFLAGS = 
 xpdf_OBJECTS =  Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
 GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o Parser.o \
-PDFDoc.o Stream.o XRef.o XOutputDev.o
+PDFDoc.o Stream.o TextOutputDev.o XRef.o XOutputDev.o LTKOutputDev.o \
+PSOutputDev.o xpdf.o
 xpdf_DEPENDENCIES =  ../goo/libgoo.a ../ltk/libltk.a
 xpdf_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
@@ -220,15 +225,16 @@ DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/Array.P .deps/Catalog.P .deps/Dict.P .deps/Error.P \
 .deps/GOutputDev.P .deps/Gfx.P .deps/GfxFont.P .deps/GfxState.P \
-.deps/ImageOutputDev.P .deps/Lexer.P .deps/Link.P .deps/Object.P \
-.deps/OutputDev.P .deps/PDFDoc.P .deps/PSOutputDev.P .deps/Page.P \
-.deps/Params.P .deps/Parser.P .deps/Stream.P .deps/TextOutputDev.P \
-.deps/XOutputDev.P .deps/XRef.P .deps/gpdf.P .deps/pdfimages.P \
-.deps/pdfinfo.P .deps/pdftopbm.P .deps/pdftops.P .deps/pdftotext.P
+.deps/ImageOutputDev.P .deps/LTKOutputDev.P .deps/Lexer.P .deps/Link.P \
+.deps/Object.P .deps/OutputDev.P .deps/PBMOutputDev.P .deps/PDFDoc.P \
+.deps/PSOutputDev.P .deps/Page.P .deps/Params.P .deps/Parser.P \
+.deps/Stream.P .deps/TextOutputDev.P .deps/XOutputDev.P .deps/XRef.P \
+.deps/gpdf.P .deps/pdfimages.P .deps/pdfinfo.P .deps/pdftopbm.P \
+.deps/pdftops.P .deps/pdftotext.P .deps/xpdf.P
 SOURCES = $(pdftops_SOURCES) $(pdftotext_SOURCES) $(pdfinfo_SOURCES) $(pdftopbm_SOURCES) $(pdfimages_SOURCES) $(gpdf_SOURCES) $(xpdf_SOURCES)
 OBJECTS = $(pdftops_OBJECTS) $(pdftotext_OBJECTS) $(pdfinfo_OBJECTS) $(pdftopbm_OBJECTS) $(pdfimages_OBJECTS) $(gpdf_OBJECTS) $(xpdf_OBJECTS)
 
@@ -257,8 +263,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -393,7 +399,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -473,7 +479,7 @@ uninstall: uninstall-am
 all-am: Makefile $(PROGRAMS) $(DATA)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(gladedir)
 
@@ -528,11 +534,10 @@ all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
-	xpdf.cc
 
 xpdf-ltk.h: xpdf.ltk
 	rm -f $@
-	$(LTKLIBDIR)/ltkbuild <xpdf.ltk >$@.new
+	$(top_srcdir)/ltk/ltkbuild <xpdf.ltk >$@.new
 	mv $@.new $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.