-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS)
-
-pdfimages_SOURCES = \
- $(common_sources) \
- ImageOutputDev.cc \
- ImageOutputDev.h \
- pdfimages.cc
-
-pdfimages_LDADD = ../goo/libgoo.a
-
-pdftops_SOURCES = \
- $(common_sources) \
- PSOutputDev.cc \
- pdftops.cc
-pdftops_LDADD = ../goo/libgoo.a
-
-pdftotext_SOURCES = \
- $(common_sources) \
- pdftotext.cc
-pdftotext_LDADD = ../goo/libgoo.a
-
-pdfinfo_SOURCES = \
- $(common_sources) \
- pdfinfo.cc
-pdfinfo_LDADD = ../goo/libgoo.a
-
-pdftopbm_SOURCES = \
- $(common_sources) \
- PBMOutputDev.cc \
- PBMOutputDev.h \
- XOutputDev.cc \
- XOutputDev.h \
- XOutputFontInfo.h \
- pdftopbm.cc
-
-pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS)
-
-xpdf-ltk.h: xpdf.ltk
- rm -f $@
- $(top_srcdir)/ltk/ltkbuild <xpdf.ltk >$@.new
- mv $@.new $@
-
-bitmaps = \
- about.xbm \
- dblLeftArrow.xbm \
- dblRightArrow.xbm \
- find.xbm \
- leftArrow.xbm \
- postscript.xbm \
- rightArrow.xbm \
- xpdfIcon.xpm \
- zoomIn.xbm \
- zoomOut.xbm
-
-ltk = \
- xpdf-flip.ltk \
- xpdf-top.ltk \
- xpdf.ltk
-
-goaddir = $(sysconfdir)/CORBA/servers
-oafdir = $(datadir)/oaf
-
-if USING_OAF
-oaf_DATA = $(OAF_FILES)
-else
-goad_DATA = $(GOAD_FILES)
-endif
-
-GOAD_FILES = application-x-pdf.gnorba
-OAF_FILES = application-x-pdf.oafinfo
-
-XML_FILES = \
- gpdf-ui.xml \
- bonobo-application-x-pdf-ui.xml
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
-
-BUILT_SOURCES=$(XML_FILES:.xml=.h)
-
-%.h : %.xml
- bonobo-ui-extract $^ > $@
-
-EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(GOAD_FILES) \
- $(OAF_FILES) config.h $(XML_FILES)
-
-
+xpdf_LDADD = \
+ libxpdf.a \
+ $(top_builddir)/goo/libGoo.a \
+ -lXpm \
+ $(EXTRA_GNOME_LIBS) \
+ $(libpaper_LIBS)
+
+#pdfimages_SOURCES =
+# $(common_sources)
+# ImageOutputDev.cc
+# ImageOutputDev.h
+# pdfimages.cc
+
+#pdfimages_LDADD = ../goo/libGoo.a
+#
+#pdftops_SOURCES =
+# $(common_sources)
+# PSOutputDev.cc
+# pdftops.cc
+#pdftops_LDADD = ../goo/libGoo.a
+
+#pdftotext_SOURCES =
+# $(common_sources)
+# pdftotext.cc
+#pdftotext_LDADD = ../goo/libGoo.a
+
+#pdfinfo_SOURCES =
+# $(common_sources)
+# pdfinfo.cc
+#pdfinfo_LDADD = ../goo/libGoo.a
+
+#pdftopbm_SOURCES =
+# $(common_sources)
+# PBMOutputDev.cc
+# PBMOutputDev.h
+# XOutputDev.cc
+# XOutputDev.h
+# XOutputFontInfo.h
+# pdftopbm.cc
+
+#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
+
+gpdf-marshal.h: gpdf-marshal.list $(GLIB_GENMARSHAL)
+ $(GLIB_GENMARSHAL) $< --header --prefix=gpdf_marshal > $@
+
+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
+
+gladedir = $(datadir)/gpdf/glade
+glade_DATA = \
+ gpdf-print-progress-dialog.glade \
+ gpdf-properties-dialog.glade
+
+server_in_files = GNOME_PDF.server.in.in
+serverdir = $(libdir)/bonobo/servers
+server_DATA = $(server_in_files:.server.in.in=.server)
+$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+@INTLTOOL_SERVER_RULE@
+
+uidir = $(datadir)/gnome-2.0/ui
+ui_DATA = \
+ gpdf-control-ui.xml
+
+CLEANFILES = \
+ $(server_DATA) \
+ $(server_in_files:.server.in.in=.server.in) \
+ $(marshal_sources)
+
+EXTRA_DIST = $(stock_DATA) \
+ gpdf-marshal.list \
+ $(server_in_files) \
+ config.h \
+ $(ui_DATA) \
+ $(glade_DATA)