diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-12-22 00:44:41 (GMT) |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-22 00:44:41 (GMT) |
commit | a4cf673a3347ec011ebc90b22b6541bae0b9f6b4 (patch) | |
tree | c083238873e7fd943411e0bb2e1a761adf716783 /pdf/xpdf/Makefile.am | |
parent | d6198ac2024d229d47b631648fe8352ffb4d3e80 (diff) |
Switch from .a to libtool convenience libraries.
Tue Dec 21 19:28:55 2004 Owen Taylor <otaylor@redhat.com>
* pdf/{goo,fofi,splash,xpdf}/Makefile.am: Switch from
.a to libtool convenience libraries.
* shell/ev-window.c (ev_window_open): Hard code loading
a PDF document.
* backend/ev-document.h: Add a boolean return to load(),
fix GError * to GError **.
* pdf/xpdf/pdf-document.[ch] Makefile.am: Add a stub
object for a PDF backend EvDocument.
Diffstat (limited to 'pdf/xpdf/Makefile.am')
-rw-r--r-- | pdf/xpdf/Makefile.am | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index 5d93140..2d2216c 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/backend \ -I$(top_srcdir)/pdf \ -I$(top_srcdir)/pdf/goo \ -I$(top_srcdir)/pdf/fofi \ @@ -9,9 +10,9 @@ INCLUDES = \ noinst_PROGRAMS = test-gdk-output-dev -noinst_LIBRARIES = libxpdf.a +noinst_LTLIBRARIES = libxpdf.la libpdfdocument.la -libxpdf_a_SOURCES = \ +libxpdf_la_SOURCES = \ Annot.cc \ Annot.h \ Array.cc \ @@ -73,6 +74,8 @@ libxpdf_a_SOURCES = \ PDFDocEncoding.h \ PSTokenizer.cc \ PSTokenizer.h \ + SplashOutputDev.cc \ + SplashOutputDev.h \ Stream-CCITT.h \ Stream.cc \ Stream.h \ @@ -82,30 +85,39 @@ libxpdf_a_SOURCES = \ UnicodeTypeTable.cc \ UnicodeTypeTable.h \ XRef.cc \ - XRef.h - -common_sources = \ + XRef.h \ + \ CharTypes.h \ CompactFontTables.h \ ErrorCodes.h \ NameToUnicodeTable.h \ + GDKSplashOutputDev.cc \ + GDKSplashOutputDev.h \ TextOutputDev.cc \ TextOutputDev.h \ UTF8.h +# The sources at the end are put in libxpdf.a for convenience here, but are +# conceptually part of the apps not part of the libs. + test_gdk_output_dev_SOURCES = \ - GDKSplashOutputDev.cc \ - GDKSplashOutputDev.h \ - SplashOutputDev.cc \ - SplashOutputDev.h \ - $(common_sources) \ test-gdk-output-dev.cc -test_gdk_output_dev_LDADD = \ - libxpdf.a \ - $(top_builddir)/pdf/goo/libGoo.a \ - $(top_builddir)/pdf/fofi/libfofi.a \ - $(top_builddir)/pdf/splash/libsplash.a \ +test_gdk_output_dev_LDADD = \ + libxpdf.la \ + $(top_builddir)/pdf/goo/libGoo.la \ + $(top_builddir)/pdf/fofi/libfofi.la \ + $(top_builddir)/pdf/splash/libsplash.la \ $(GTK_LIBS) +libpdfdocument_la_SOURCES = \ + pdf-document.c \ + pdf-document.h + +libpdfdocument_la_LIBADD = \ + libxpdf.la \ + $(top_builddir)/pdf/goo/libGoo.la \ + $(top_builddir)/pdf/fofi/libfofi.la \ + $(top_builddir)/pdf/splash/libsplash.la + EXTRA_DIST = config.h |