X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=pdf%2Fxpdf%2FMakefile.am;h=e4d059c9c748d8bd1e94a1e2f8b3e19c9f7e20f5;hb=ed8d29b07f2233cbaa4c134b78710619049a652b;hp=1e4e466d8f54df2b964f4f3e8fb7b35f75184aa4;hpb=8f31a8727ebd8e58b2f31781d9de7760473665e0;p=evince.git diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index 1e4e466d..e4d059c9 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -1,11 +1,15 @@ +SUBDIRS = . tests INCLUDES = \ + -I$(top_srcdir) \ -I$(top_srcdir)/goo \ - -I$(top_srcdir)/ltk \ + -I$(top_srcdir)/lib/ggv-sidebar \ -DDATADIR=\""$(datadir)"\" \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \ $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_PRINT_PRIVATE_CFLAGS) \ + $(WARN_CFLAGS) \ $(libpaper_CFLAGS) if WITH_GNOME @@ -14,7 +18,7 @@ else gui = xpdf endif -BUILT_SOURCES = \ +marshal_sources = \ gpdf-marshal.c \ gpdf-marshal.h @@ -25,7 +29,9 @@ bin_PROGRAMS = $(gui) libexec_PROGRAMS = gnome-pdf-viewer -common_sources = \ +noinst_LIBRARIES = libxpdf.a libgpdf.a + +libxpdf_a_SOURCES = \ Annot.cc \ Annot.h \ Array.cc \ @@ -35,24 +41,18 @@ common_sources = \ BuiltinFont.h \ BuiltinFontTables.cc \ BuiltinFontTables.h \ - CMap.cc \ - CMap.h \ Catalog.cc \ Catalog.h \ CharCodeToUnicode.cc \ CharCodeToUnicode.h \ - CharTypes.h \ - CompactFontTables.h \ + CMap.cc \ + CMap.h \ Decrypt.cc \ Decrypt.h \ Dict.cc \ Dict.h \ - DisplayFontTable.h \ Error.cc \ Error.h \ - ErrorCodes.h \ - FTFont.cc \ - FTFont.h \ FontEncodingTables.cc \ FontEncodingTables.h \ FontFile.cc \ @@ -67,53 +67,75 @@ common_sources = \ GfxState.h \ GlobalParams.cc \ GlobalParams.h \ + JBIG2Stream.cc \ + JBIG2Stream.h \ Lexer.cc \ Lexer.h \ Link.cc \ Link.h \ NameToCharCode.cc \ NameToCharCode.h \ - NameToUnicodeTable.h \ Object.cc \ Object.h \ + Outline.cc \ + Outline.h \ OutputDev.cc \ OutputDev.h \ - PDFDoc.cc \ - PDFDoc.h \ - PSTokenizer.cc \ - PSTokenizer.h \ Page.cc \ Page.h \ Parser.cc \ Parser.h \ - SFont.cc \ - SFont.h \ + PDFDoc.cc \ + PDFDoc.h \ + PDFDocEncoding.cc \ + PDFDocEncoding.h \ + PSTokenizer.cc \ + PSTokenizer.h \ Stream-CCITT.h \ Stream.cc \ Stream.h \ + UnicodeMap.cc \ + UnicodeMap.h \ + UnicodeMapTables.h \ + XRef.cc \ + XRef.h + +common_sources = \ + CharTypes.h \ + CompactFontTables.h \ + DisplayFontTable.h \ + ErrorCodes.h \ + FTFont.cc \ + FTFont.h \ + NameToUnicodeTable.h \ + SFont.cc \ + SFont.h \ T1Font.cc \ T1Font.h \ TTFont.cc \ TTFont.h \ TextOutputDev.cc \ TextOutputDev.h \ - UTF8.h \ - UnicodeMap.cc \ - UnicodeMap.h \ - UnicodeMapTables.h \ - XRef.cc \ - XRef.h + UTF8.h -gnome_pdf_viewer_SOURCES = \ - $(common_sources) \ - BonoboStream.h \ +libgpdf_a_SOURCES = \ BonoboStream.cc \ + BonoboStream.h \ + GnomeVFSStream.cc \ + GnomeVFSStream.h \ GPOutputDev.cc \ GPOutputDev.h \ - bonobo-application-x-pdf.cc \ + eog-hig-dialog.c \ + eog-hig-dialog.h \ gpdf-control.cc \ gpdf-control.h \ gpdf-g-switch.h \ + gpdf-link-canvas-item.cc \ + gpdf-link-canvas-item.h \ + gpdf-links-canvas-layer.cc \ + gpdf-links-canvas-layer.h \ + gpdf-persist-file.cc \ + gpdf-persist-file.h \ gpdf-persist-stream.cc \ gpdf-persist-stream.h \ gpdf-stock-icons.c \ @@ -125,13 +147,20 @@ gnome_pdf_viewer_SOURCES = \ gtkgesture.h \ page-control.c \ page-control.h \ + pdf-info-dict-util.cc \ + pdf-info-dict-util.h \ pdf-properties-display.c \ pdf-properties-display.h \ - $(BUILT_SOURCES) + gpdf-font-face.c \ + gpdf-font-face.h \ + $(marshal_sources) + +gnome_pdf_viewer_SOURCES = \ + $(common_sources) \ + bonobo-application-x-pdf.cc \ + nautilus-pdf-property-page.cc \ + nautilus-pdf-property-page.h -# Font embedding hack for Gnome Print < 2.1.?2? -# gpdf-gnome-font.c \ -# gpdf-gnome-font.h \ # Old files # GOutputDev.cc \ @@ -143,23 +172,36 @@ gnome_pdf_viewer_SOURCES = \ # gpdf-embeddable-view.cc \ # gpdf-embeddable-view.h -gnome_pdf_viewer_LDADD = \ - $(top_builddir)/goo/libgoo.a \ - $(EXTRA_GNOME_LIBS) \ +gnome_pdf_viewer_LDADD = \ + libxpdf.a \ + libgpdf.a \ + $(top_builddir)/goo/libGoo.a \ + $(top_builddir)/lib/ggv-sidebar/libggv-sidebar.a \ + $(EXTRA_GNOME_LIBS) \ $(libpaper_LIBS) xpdf_SOURCES = \ $(common_sources) \ + XPDFApp.cc \ + XPDFApp.h \ + XPDFCore.cc \ + XPDFCore.h \ + XPDFTree.cc \ + XPDFTree.h \ + XPDFViewer.cc \ + XPDFViewer.h \ XOutputDev.cc \ - LTKOutputDev.cc \ + XOutputDev.h \ + XPixmapOutputDev.cc \ + XPixmapOutputDev.h \ PSOutputDev.cc \ PSOutputDev.h \ xpdf.cc xpdf_CFLAGS = $(X_CFLAGS) xpdf_LDADD = \ - $(top_builddir)/goo/libgoo.a \ - $(top_builddir)/ltk/libltk.a \ + libxpdf.a \ + $(top_builddir)/goo/libGoo.a \ -lXpm \ $(EXTRA_GNOME_LIBS) \ $(libpaper_LIBS) @@ -170,23 +212,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) @@ -197,12 +239,7 @@ xpdf_LDADD = \ # XOutputFontInfo.h # pdftopbm.cc -#pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS) - -xpdf-ltk.h: xpdf.ltk - rm -f $@ - $(top_srcdir)/ltk/ltkbuild $@.new - mv $@.new $@ +#pdftopbm_LDADD = ../goo/libGoo.a $(EXTRA_GNOME_LIBS) #bitmaps = # about.xbm @@ -223,6 +260,14 @@ gpdf-marshal.c: gpdf-marshal.list $(GLIB_GENMARSHAL) echo "#include \"gpdf-marshal.h\"" > $@ && \ $(GLIB_GENMARSHAL) $< --body --prefix=gpdf_marshal >> $@ +BUILT_SOURCES = $(marshal_sources) +DONT_DIST_SOURCE = $(marshal_sources) + +dist-hook: + for file in $(DONT_DIST_SOURCE) ; do \ + rm -f $(distdir)/$$file ; \ + done + stockdir = $(datadir)/pixmaps/gpdf stock_DATA = fitwidth.png @@ -239,11 +284,12 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) uidir = $(datadir)/gnome-2.0/ui ui_DATA = \ - bonobo-application-x-pdf-ui.xml \ gpdf-control-ui.xml -CLEANFILES = $(server_DATA) $(BUILT_SOURCES) -DISTCLEANFILES = $(server_in_files:.server.in.in=.server.in) +CLEANFILES = \ + $(server_DATA) \ + $(server_in_files:.server.in.in=.server.in) \ + $(marshal_sources) EXTRA_DIST = $(stock_DATA) \ gpdf-marshal.list \