From baa0b607f331de9ee28bf2a2180339e4830f9550 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Sun, 2 Jan 2005 12:27:03 +0000
Subject: [PATCH] Fix distcheck

2005-01-02  Marco Pesenti Gritti  <marco@gnome.org>

        * Makefile.am:
        * backend/Makefile.am:
        * data/Makefile.am:
        * dvi/Makefile.am:
        * dvi/dvilib/Makefile.am:
        * pdf/xpdf/Makefile.am:
        * po/POTFILES.in:
        * ps/Makefile.am:

        Fix distcheck
---
 ChangeLog              | 13 +++++++++++++
 Makefile.am            |  5 +++++
 backend/Makefile.am    | 16 ++++++++--------
 dvi/Makefile.am        |  6 ++++--
 dvi/dvilib/Makefile.am |  2 ++
 pdf/xpdf/Makefile.am   |  6 ++++--
 po/POTFILES.in         |  2 --
 ps/Makefile.am         |  1 +
 8 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1f569b3..d4e01e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-01-02  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* Makefile.am:
+	* backend/Makefile.am:
+	* data/Makefile.am:
+	* dvi/Makefile.am:
+	* dvi/dvilib/Makefile.am:
+	* pdf/xpdf/Makefile.am:
+	* po/POTFILES.in:
+	* ps/Makefile.am:
+
+	Fix distcheck
+
 2005-01-01  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* shell/ev-view.c: (ev_view_realize):
diff --git a/Makefile.am b/Makefile.am
index 631f74b1..e9c225c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,8 @@ SUBDIRS = cut-n-paste data backend po pdf dvi ps pixbuf shell
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
 EXTRA_DIST = $(intltool_extra)
+
+DISTCLEANFILES = 		\
+	intltool-extract 	\
+	intltool-merge 		\
+	intltool-update
diff --git a/backend/Makefile.am b/backend/Makefile.am
index d1f5cbf0..1e77a353 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -23,17 +23,17 @@ libevbackend_la_SOURCES=			\
 	ev-ps-exporter.h			\
 	$(NULL)
 
+BUILT_SOURCES=				\
+	ev-backend-marshalers.h		\
+	ev-backend-marshalers.c
+
+CLEANFILES = $(BUILT_SOURCES)
+
 ev-backend-marshalers.h: ev-backend-marshalers.list
-	cd $(srcdir) \
-	&& $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal ev-backend-marshalers.list --header > xgen-emh \
-	&& cp xgen-emh ev-backend-marshalers.h \
-	&& rm -f xgen-emh xgen-emh~
+	$(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --header > $@
 
 ev-backend-marshalers.c: ev-backend-marshalers.list
-	cd $(srcdir) \
-	&& $(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal ev-backend-marshalers.list --body > xgen-emc \
-	&& cp xgen-emc ev-backend-marshalers.c \
-	&& rm -f xgen-emc xgen-emc~
+	$(GLIB_GENMARSHAL) --prefix=_ev_backend_marshal $(srcdir)/ev-backend-marshalers.list --body > $@
 
 ev-backend-marshal.c: ev-backend-marshalers.h ev-backend-marshalers.c
 
diff --git a/dvi/Makefile.am b/dvi/Makefile.am
index 7694744d..54682965 100644
--- a/dvi/Makefile.am
+++ b/dvi/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = dvilib
 
 INCLUDES =					\
-	-Idvilib				\
+	-I$(srcdir)/dvilib			\
 	$(DVI_CFLAGS)				\
 	-I$(top_srcdir)
 
@@ -20,7 +20,9 @@ dviviewer_SOURCES =				\
 	view.cc					\
 						\
 	model.hh				\
-	model.cc
+	model.cc				\
+						\
+	observer.hh
 
 dviviewer_LDADD = 				\
         $(top_builddir)/dvi/dvilib/libdvilib.a	\
diff --git a/dvi/dvilib/Makefile.am b/dvi/dvilib/Makefile.am
index 5331ab0d..2ccb2e10 100644
--- a/dvi/dvilib/Makefile.am
+++ b/dvi/dvilib/Makefile.am
@@ -13,8 +13,10 @@ libdvilib_a_SOURCES =				\
 	dl-dvi-file.hh				\
 	dl-dvi-fontdefinition.hh		\
 	dl-dvi-parser.hh			\
+	dl-dvi-program.hh			\
 	dl-dvi-runtime.hh			\
 	dl-font.hh				\
 	dl-loader.hh				\
 	dl-pkfont.hh				\
+	dl-refcounted.hh			\
 	dl-vffont.hh
diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 4e0f9287..bbd94e8f 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -97,7 +97,9 @@ libxpdf_la_SOURCES =		\
 	PSOutputDev.h		\
 	TextOutputDev.cc	\
 	TextOutputDev.h		\
-	UTF8.h
+	UTF8.h			\
+				\
+	gpdf-g-switch.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.
@@ -124,4 +126,4 @@ libpdfdocument_la_LIBADD =                                    	\
 	$(top_builddir)/pdf/fofi/libfofi.la                     \
 	$(top_builddir)/pdf/splash/libsplash.la
 
-EXTRA_DIST = config.h
+EXTRA_DIST = xpdfconfig.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a7fd508..12b4680d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-ps/ggvutils.c
-ps/gtkgs.c
 shell/eggfindbar.c
 shell/ev-application.c
 shell/ev-window.c
diff --git a/ps/Makefile.am b/ps/Makefile.am
index af7d17ab..0752d2f0 100644
--- a/ps/Makefile.am
+++ b/ps/Makefile.am
@@ -11,6 +11,7 @@ libgtkgs_la_SOURCES = 	\
 	gsio.h		\
 	gsdefaults.c	\
 	gsdefaults.h	\
+	gstypes.h	\
 	ps.c		\
 	ps.h		\
 	ps-document.c	\
-- 
2.43.5