drag and drop, removed redundant verb popup code.

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

diff --git a/pdf/xpdf/Makefile.in b/pdf/xpdf/Makefile.in
index 10af0b63632ded7694743a5aa81ea73a4dcbf640..083721d6743dc2a8e12971daa35241dcd8dd691b 100644 (file)
--- a/pdf/xpdf/Makefile.in
+++ b/pdf/xpdf/Makefile.in
@@ -115,15 +115,16 @@ bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui) bonobo-image-
 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)
 
-bonobo_image_x_pdf_SOURCES =   $(common_sources)               BonoboFile.h                    BonoboFile.cc                   GOutputDev.cc                   bonobo-image-x-pdf.cc
+
+bonobo_image_x_pdf_SOURCES =   $(common_sources)               BonoboStream.h                  BonoboStream.cc                 GOutputDev.cc                   bonobo-image-x-pdf.cc
 
 
 bonobo_image_x_pdf_CFLAGS =    -DBONOBO_IO
@@ -171,7 +172,10 @@ gladedir = $(datadir)/xpdf/glade
 glade_DATA =   about.glade             gpdf.glade
 
 
-EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(glade_DATA)
+gnorbadir = $(sysconfdir)/CORBA/servers
+gnorba_DATA = image-x-pdf.gnorba
+
+EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(glade_DATA) $(gnorba_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
@@ -215,11 +219,8 @@ 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 = 
-gpdf_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 GOutputDev.o gpdf.o
-gpdf_DEPENDENCIES =  ../goo/libgoo.a
+gpdf_OBJECTS =  gpdf.o
+gpdf_DEPENDENCIES = 
 gpdf_LDFLAGS = 
 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 \
@@ -230,7 +231,7 @@ xpdf_LDFLAGS =
 bonobo_image_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 BonoboFile.o GOutputDev.o bonobo-image-x-pdf.o
+TextOutputDev.o XRef.o BonoboStream.o GOutputDev.o bonobo-image-x-pdf.o
 bonobo_image_x_pdf_DEPENDENCIES =  ../goo/libgoo.a
 bonobo_image_x_pdf_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
@@ -243,7 +244,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
 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 =  $(glade_DATA)
+DATA =  $(glade_DATA) $(gnorba_DATA)
 
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
@@ -252,7 +253,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/Array.P .deps/BonoboFile.P .deps/Catalog.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/ImageOutputDev.P .deps/LTKOutputDev.P .deps/Lexer.P .deps/Link.P \
@@ -388,6 +389,25 @@ uninstall-gladeDATA:
          rm -f $(DESTDIR)$(gladedir)/$$p; \
        done
 
+install-gnorbaDATA: $(gnorba_DATA)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(gnorbadir)
+       @list='$(gnorba_DATA)'; for p in $$list; do \
+         if test -f $(srcdir)/$$p; then \
+           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnorbadir)/$$p"; \
+           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gnorbadir)/$$p; \
+         else if test -f $$p; then \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gnorbadir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(gnorbadir)/$$p; \
+         fi; fi; \
+       done
+
+uninstall-gnorbaDATA:
+       @$(NORMAL_UNINSTALL)
+       list='$(gnorba_DATA)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(gnorbadir)/$$p; \
+       done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -499,20 +519,22 @@ installcheck: installcheck-am
 install-exec-am: install-binPROGRAMS
 install-exec: install-exec-am
 
-install-data-am: install-gladeDATA
+install-data-am: install-gladeDATA install-gnorbaDATA
 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-gladeDATA \
+               uninstall-gnorbaDATA
 uninstall: uninstall-am
 all-am: Makefile $(PROGRAMS) $(DATA)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(gladedir)
+       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(gladedir) \
+               $(DESTDIR)$(gnorbadir)
 
 
 mostlyclean-generic:
@@ -556,10 +578,11 @@ 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 \
-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 \
+install-gladeDATA 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 \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \