Completely synched with Xpdf 0.90

[evince.git] / pdf / xpdf / Makefile.in

diff --git a/pdf/xpdf/Makefile.in b/pdf/xpdf/Makefile.in
index a6442e93a92b0d3980d095c5708b8fa3875be315..0c29554ba2240b0c097f823cc11167fad4ad8608 100644 (file)
--- a/pdf/xpdf/Makefile.in
+++ b/pdf/xpdf/Makefile.in
@@ -60,12 +60,20 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AS = @AS@
 host_alias = @host_alias@
 host_triplet = @host@
 AS = @AS@

+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@

 CC = @CC@
 CXX = @CXX@
 CC = @CC@
 CXX = @CXX@

+DATADIRNAME = @DATADIRNAME@

 DLLTOOL = @DLLTOOL@
 EXE = @EXE@
 DLLTOOL = @DLLTOOL@
 EXE = @EXE@

+EXTRA_GLIB_CFLAGS = @EXTRA_GLIB_CFLAGS@
+EXTRA_GLIB_LIBS = @EXTRA_GLIB_LIBS@

 EXTRA_GNOME_CFLAGS = @EXTRA_GNOME_CFLAGS@
 EXTRA_GNOME_LIBS = @EXTRA_GNOME_LIBS@
 EXTRA_GNOME_CFLAGS = @EXTRA_GNOME_CFLAGS@
 EXTRA_GNOME_LIBS = @EXTRA_GNOME_LIBS@

+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@

 GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
 GNOMEUI_LIBS = @GNOMEUI_LIBS@
 GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
 GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
 GNOMEUI_LIBS = @GNOMEUI_LIBS@
 GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@


@@ -80,12 +88,20 @@ GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@

 LD = @LD@
 LIBPREFIX = @LIBPREFIX@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 LD = @LD@
 LIBPREFIX = @LIBPREFIX@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@

+MKINSTALLDIRS = @MKINSTALLDIRS@

 NM = @NM@
 OPTIONS = @OPTIONS@
 ORBIT_CFLAGS = @ORBIT_CFLAGS@
 NM = @NM@
 OPTIONS = @OPTIONS@
 ORBIT_CFLAGS = @ORBIT_CFLAGS@


@@ -93,39 +109,52 @@ ORBIT_CONFIG = @ORBIT_CONFIG@
 ORBIT_IDL = @ORBIT_IDL@
 ORBIT_LIBS = @ORBIT_LIBS@
 PACKAGE = @PACKAGE@
 ORBIT_IDL = @ORBIT_IDL@
 ORBIT_LIBS = @ORBIT_LIBS@
 PACKAGE = @PACKAGE@

+POFILES = @POFILES@
+POSUB = @POSUB@

 PTHREAD_LIB = @PTHREAD_LIB@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 PTHREAD_LIB = @PTHREAD_LIB@
 RANLIB = @RANLIB@
 STRIP = @STRIP@

+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@

 VERSION = @VERSION@
 XPM_LIBS = @XPM_LIBS@
 YACC = @YACC@
 ZVT_LIBS = @ZVT_LIBS@
 cflags_set = @cflags_set@
 cxxflags_set = @cxxflags_set@
 VERSION = @VERSION@
 XPM_LIBS = @XPM_LIBS@
 YACC = @YACC@
 ZVT_LIBS = @ZVT_LIBS@
 cflags_set = @cflags_set@
 cxxflags_set = @cxxflags_set@

+l = @l@

 
 

-INCLUDES =     -I$(top_srcdir)/goo             -I$(top_srcdir)/ltk             -DGPDF_GLADE_DIR=\""$(gladedir)"\"              $(EXTRA_GNOME_CFLAGS)
+INCLUDES =     -I$(top_srcdir)/goo                             -I$(top_srcdir)/ltk                             $(EXTRA_GLIB_CFLAGS)                            $(EXTRA_GNOME_CFLAGS)

 
 

-@WITH_GNOME_TRUE@gui = gpdf
+@WITH_GNOME_TRUE@gui = xpdf gpdf

 @WITH_GNOME_FALSE@gui = xpdf
 
 @WITH_GNOME_FALSE@gui = xpdf
 

-bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui)
+bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui) bonobo-application-x-pdf

 
 

-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
+common_sources =       Array.cc                        BaseFile.h                      Catalog.cc                      Dict.cc                         Error.cc                        FontEncoding.cc                 FontEncoding.h                  FontFile.cc                     FontFile.h                      FontInfo.h                      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_CFLAGS =          -DBONOBO_IO

 
 

-gpdf_SOURCES =         $(common_sources)               GOutputDev.cc                   gpdf.cc

 
 

+gpdf_SOURCES =         gpdf.cc

 
 

-gpdf_LDADD =   $(EXTRA_GNOME_LIBS)             ../goo/libgoo.a

 
 

+gpdf_LDADD =   $(GTK_LIBS)                     $(GNOME_LIBDIR)                 -lbonobo                        $(GNOMEGNORBA_LIBS)             $(EXTRA_GNOME_LIBS)             $(INTLLIBS)

 
 

-xpdf_SOURCES =         $(common_sources)               XOutputDev.cc
+
+bonobo_application_x_pdf_SOURCES =     $(common_sources)                       BonoboStream.h                          BonoboStream.cc                         GOutputDev.cc                           bonobo-application-x-pdf.cc             gtkgesture.c                            gtkgesture.h
+
+
+bonobo_application_x_pdf_LDADD =       ../goo/libgoo.a                         $(GTK_LIBS)                             $(GNOME_LIBDIR)                         -lbonobo                                $(GNOMEGNORBA_LIBS)                     $(EXTRA_GLIB_LIBS)                      $(INTLLIBS)
+
+
+xpdf_SOURCES =         $(common_sources)               XOutputDev.cc                   LTKOutputDev.cc                 PSOutputDev.cc                  xpdf.cc

 
 
 xpdf_CFLAGS = $(X_CFLAGS)
 
 
 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
 
 
 pdfimages_SOURCES =    $(common_sources)               ImageOutputDev.cc               pdfimages.cc
 


@@ -155,12 +184,10 @@ bitmaps =         about.xbm                       dblLeftArrow.xbm                dblRightArrow.xbm               find.xbm                        leftArro
 ltk =          xpdf-flip.ltk           xpdf-top.ltk            xpdf.ltk
 
 
 ltk =          xpdf-flip.ltk           xpdf-top.ltk            xpdf.ltk
 
 

-gladedir = $(datadir)/xpdf/glade
-
-glade_DATA =   about.glade             gpdf.glade
+gnorbadir = $(sysconfdir)/CORBA/servers
+gnorba_DATA = application-x-pdf.gnorba

 
 

-
-EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(glade_DATA)
+EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(gnorba_DATA)

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)


@@ -174,66 +201,83 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 X_LIBS = @X_LIBS@
 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 TextOutputDev.o XRef.o PSOutputDev.o pdftops.o
+pdftops_OBJECTS =  Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+FontFile.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 TextOutputDev.o \
+XRef.o PSOutputDev.o pdftops.o

 pdftops_DEPENDENCIES =  ../goo/libgoo.a
 pdftops_LDFLAGS = 
 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 TextOutputDev.o XRef.o pdftotext.o
+pdftotext_OBJECTS =  Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+FontFile.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 TextOutputDev.o \
+XRef.o pdftotext.o

 pdftotext_DEPENDENCIES =  ../goo/libgoo.a
 pdftotext_LDFLAGS = 
 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 TextOutputDev.o XRef.o pdfinfo.o
+pdfinfo_OBJECTS =  Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+FontFile.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 TextOutputDev.o \
+XRef.o pdfinfo.o

 pdfinfo_DEPENDENCIES =  ../goo/libgoo.a
 pdfinfo_LDFLAGS = 
 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 TextOutputDev.o XRef.o PBMOutputDev.o XOutputDev.o \
-pdftopbm.o
+pdftopbm_OBJECTS =  Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+FontFile.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 TextOutputDev.o \
+XRef.o PBMOutputDev.o XOutputDev.o pdftopbm.o

 pdftopbm_DEPENDENCIES =  ../goo/libgoo.a
 pdftopbm_LDFLAGS = 
 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 TextOutputDev.o XRef.o ImageOutputDev.o pdfimages.o
+pdfimages_OBJECTS =  Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+FontFile.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 TextOutputDev.o \
+XRef.o ImageOutputDev.o pdfimages.o

 pdfimages_DEPENDENCIES =  ../goo/libgoo.a
 pdfimages_LDFLAGS = 
 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 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 TextOutputDev.o XRef.o XOutputDev.o
+xpdf_OBJECTS =  Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+FontFile.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 TextOutputDev.o \
+XRef.o XOutputDev.o LTKOutputDev.o PSOutputDev.o xpdf.o

 xpdf_DEPENDENCIES =  ../goo/libgoo.a ../ltk/libltk.a
 xpdf_LDFLAGS = 
 xpdf_DEPENDENCIES =  ../goo/libgoo.a ../ltk/libltk.a
 xpdf_LDFLAGS = 

+gpdf_OBJECTS =  gpdf.o
+gpdf_DEPENDENCIES = 
+gpdf_LDFLAGS = 
+bonobo_application_x_pdf_OBJECTS =  Array.o Catalog.o Dict.o Error.o \
+FontEncoding.o FontFile.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 \
+TextOutputDev.o XRef.o BonoboStream.o GOutputDev.o \
+bonobo-application-x-pdf.o gtkgesture.o
+bonobo_application_x_pdf_DEPENDENCIES =  ../goo/libgoo.a
+bonobo_application_x_pdf_LDFLAGS = 

 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@

-DATA =  $(glade_DATA)
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DATA =  $(gnorba_DATA)

 
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 

-TAR = tar
+TAR = gtar

 GZIP_ENV = --best
 GZIP_ENV = --best

-DEP_FILES =  .deps/Array.P .deps/Catalog.P .deps/Dict.P .deps/Error.P \
+DEP_FILES =  .deps/Array.P .deps/BonoboStream.P .deps/Catalog.P \
+.deps/Dict.P .deps/Error.P .deps/FontEncoding.P .deps/FontFile.P \

 .deps/GOutputDev.P .deps/Gfx.P .deps/GfxFont.P .deps/GfxState.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/PBMOutputDev.P .deps/PDFDoc.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/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
-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)
+.deps/bonobo-application-x-pdf.P .deps/gpdf.P .deps/gtkgesture.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) $(xpdf_SOURCES) $(gpdf_SOURCES) $(bonobo_application_x_pdf_SOURCES)
+OBJECTS = $(pdftops_OBJECTS) $(pdftotext_OBJECTS) $(pdfinfo_OBJECTS) $(pdftopbm_OBJECTS) $(pdfimages_OBJECTS) $(xpdf_OBJECTS) $(gpdf_OBJECTS) $(bonobo_application_x_pdf_OBJECTS)

 
 all: all-redirect
 .SUFFIXES:
 
 all: all-redirect
 .SUFFIXES:


@@ -323,35 +367,43 @@ pdfimages: $(pdfimages_OBJECTS) $(pdfimages_DEPENDENCIES)
        @rm -f pdfimages
        $(CXXLINK) $(pdfimages_LDFLAGS) $(pdfimages_OBJECTS) $(pdfimages_LDADD) $(LIBS)
 
        @rm -f pdfimages
        $(CXXLINK) $(pdfimages_LDFLAGS) $(pdfimages_OBJECTS) $(pdfimages_LDADD) $(LIBS)
 

+xpdf: $(xpdf_OBJECTS) $(xpdf_DEPENDENCIES)
+       @rm -f xpdf
+       $(CXXLINK) $(xpdf_LDFLAGS) $(xpdf_OBJECTS) $(xpdf_LDADD) $(LIBS)
+

 gpdf: $(gpdf_OBJECTS) $(gpdf_DEPENDENCIES)
        @rm -f gpdf
        $(CXXLINK) $(gpdf_LDFLAGS) $(gpdf_OBJECTS) $(gpdf_LDADD) $(LIBS)
 
 xpdf: $(xpdf_OBJECTS) $(xpdf_DEPENDENCIES)
        @rm -f xpdf
 gpdf: $(gpdf_OBJECTS) $(gpdf_DEPENDENCIES)
        @rm -f gpdf
        $(CXXLINK) $(gpdf_LDFLAGS) $(gpdf_OBJECTS) $(gpdf_LDADD) $(LIBS)
 
 xpdf: $(xpdf_OBJECTS) $(xpdf_DEPENDENCIES)
        @rm -f xpdf

-       $(CXXLINK) $(xpdf_LDFLAGS) $(xpdf_OBJECTS) $(xpdf_LDADD) $(LIBS)
+       $(LINK) $(xpdf_LDFLAGS) $(xpdf_OBJECTS) $(xpdf_LDADD) $(LIBS)
+
+bonobo-application-x-pdf: $(bonobo_application_x_pdf_OBJECTS) $(bonobo_application_x_pdf_DEPENDENCIES)
+       @rm -f bonobo-application-x-pdf
+       $(CXXLINK) $(bonobo_application_x_pdf_LDFLAGS) $(bonobo_application_x_pdf_OBJECTS) $(bonobo_application_x_pdf_LDADD) $(LIBS)

 .cc.o:
        $(CXXCOMPILE) -c $<
 .cc.lo:
        $(LTCXXCOMPILE) -c $<
 
 .cc.o:
        $(CXXCOMPILE) -c $<
 .cc.lo:
        $(LTCXXCOMPILE) -c $<
 

-install-gladeDATA: $(glade_DATA)
+install-gnorbaDATA: $(gnorba_DATA)

        @$(NORMAL_INSTALL)
        @$(NORMAL_INSTALL)

-       $(mkinstalldirs) $(DESTDIR)$(gladedir)
-       @list='$(glade_DATA)'; for p in $$list; do \
+       $(mkinstalldirs) $(DESTDIR)$(gnorbadir)
+       @list='$(gnorba_DATA)'; for p in $$list; do \

          if test -f $(srcdir)/$$p; then \
          if test -f $(srcdir)/$$p; then \

-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gladedir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gladedir)/$$p; \
+           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnorbadir)/$$p"; \
+           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnorbadir)/$$p; \

          else if test -f $$p; then \
          else if test -f $$p; then \

-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gladedir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(gladedir)/$$p; \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gnorbadir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(gnorbadir)/$$p; \

          fi; fi; \
        done
 
          fi; fi; \
        done
 

-uninstall-gladeDATA:
+uninstall-gnorbaDATA:

        @$(NORMAL_UNINSTALL)
        @$(NORMAL_UNINSTALL)

-       list='$(glade_DATA)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(gladedir)/$$p; \
+       list='$(gnorba_DATA)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(gnorbadir)/$$p; \

        done
 
 tags: TAGS
        done
 
 tags: TAGS


@@ -465,20 +517,20 @@ installcheck: installcheck-am
 install-exec-am: install-binPROGRAMS
 install-exec: install-exec-am
 
 install-exec-am: install-binPROGRAMS
 install-exec: install-exec-am
 

-install-data-am: install-gladeDATA
+install-data-am: install-gnorbaDATA

 install-data: install-data-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 install-data: install-data-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am

-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-gnorbaDATA

 uninstall: uninstall-am
 all-am: Makefile $(PROGRAMS) $(DATA)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 uninstall: uninstall-am
 all-am: Makefile $(PROGRAMS) $(DATA)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:

-       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(gladedir)
+       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(gnorbadir)

 
 
 mostlyclean-generic:
 
 
 mostlyclean-generic:


@@ -521,8 +573,8 @@ maintainer-clean: maintainer-clean-am
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \

-clean-libtool maintainer-clean-libtool uninstall-gladeDATA \
-install-gladeDATA tags mostlyclean-tags distclean-tags clean-tags \
+clean-libtool maintainer-clean-libtool uninstall-gnorbaDATA \
+install-gnorbaDATA tags mostlyclean-tags distclean-tags clean-tags \

 maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
 clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
 check-am installcheck-am installcheck install-exec-am install-exec \
 maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
 clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
 check-am installcheck-am installcheck install-exec-am install-exec \


@@ -531,11 +583,10 @@ all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 

-       xpdf.cc

 
 xpdf-ltk.h: xpdf.ltk
        rm -f $@
 
 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.
        mv $@.new $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.