From 3e669884bbf267fa8b3425a7528d538b74385dd6 Mon Sep 17 00:00:00 2001
From: "m. allan noah" <kitno455@gmail.com>
Date: Wed, 9 Jun 2010 09:17:40 -0400
Subject: [PATCH] Various Makefile corrections for genesys_gl847, po files and
 Changelog

---
 ChangeLog           | 5 +++++
 Makefile.am         | 2 +-
 backend/Makefile.am | 2 +-
 backend/Makefile.in | 3 ++-
 po/Makefile.am      | 2 +-
 po/Makefile.in      | 3 ++-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2bb1b0155..f9401f338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-09 m. allan noah <kitno455 at gmail dot com>
+	* backend/Makefile.{am|in}: add genesys_gl847 files
+	* po/Makefile.{am|in}: add LINGUAS POTFILES to EXTRA_DIST
+	* Makefile.am: add Changelog-1.0.21 to EXTRA_DIST
+
 2010-06-08  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* backend/pixma_imageclass.c:
 	pixma: set #1 of modifiations for ImageClass MF65xx series.
diff --git a/Makefile.am b/Makefile.am
index fc03eda07..2664183b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
  ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
  ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 ChangeLog-1.0.15 \
  ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 ChangeLog-1.0.19 \
- ChangeLog-1.0.20 \
+ ChangeLog-1.0.20 ChangeLog-1.0.21 \
  $(PACKAGE).lsm
 
 #
diff --git a/backend/Makefile.am b/backend/Makefile.am
index af19c8899..5cb04d30c 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -479,7 +479,7 @@ libsane_fujitsu_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_fujitsu_la_LIBADD = $(COMMON_LIBS) libfujitsu.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
 EXTRA_DIST += fujitsu.conf.in
 
-libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_low.h
+libgenesys_la_SOURCES = genesys.c genesys.h genesys_gl646.c genesys_gl646.h genesys_gl841.c genesys_gl847.c genesys_gl847.h genesys_low.h
 libgenesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
 
 nodist_libsane_genesys_la_SOURCES = genesys-s.c
diff --git a/backend/Makefile.in b/backend/Makefile.in
index 5138be7de..bc33a7bbf 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -156,7 +156,8 @@ am_libfujitsu_la_OBJECTS = libfujitsu_la-fujitsu.lo
 libfujitsu_la_OBJECTS = $(am_libfujitsu_la_OBJECTS)
 libgenesys_la_LIBADD =
 am_libgenesys_la_OBJECTS = libgenesys_la-genesys.lo \
-	libgenesys_la-genesys_gl646.lo libgenesys_la-genesys_gl841.lo libgenesys_la-genesys_gl847.lo
+	libgenesys_la-genesys_gl646.lo libgenesys_la-genesys_gl841.lo \
+	libgenesys_la-genesys_gl847.lo
 libgenesys_la_OBJECTS = $(am_libgenesys_la_OBJECTS)
 libgphoto2_i_la_LIBADD =
 am_libgphoto2_i_la_OBJECTS = libgphoto2_i_la-gphoto2.lo
diff --git a/po/Makefile.am b/po/Makefile.am
index c26437709..29377c838 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -20,7 +20,7 @@ SRC_FILES=$(shell if test -r $(srcdir)/POTFILES; then grep -v "^\#" $(srcdir)/PO
 PO_FILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 MO_FILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.mo "; done)
 
-EXTRA_DIST = README $(GETTEXT_PACKAGE).pot
+EXTRA_DIST = README $(GETTEXT_PACKAGE).pot LINGUAS POTFILES
 EXTRA_DIST += $(PO_FILES)
 
 
diff --git a/po/Makefile.in b/po/Makefile.in
index f6bea1fda..4790aaf48 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -219,7 +219,8 @@ PO_LINGUAS = $(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/
 SRC_FILES = $(shell if test -r $(srcdir)/POTFILES; then grep -v "^\#" $(srcdir)/POTFILES; else echo ""; fi)
 PO_FILES = $(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 MO_FILES = $(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.mo "; done)
-EXTRA_DIST = README $(GETTEXT_PACKAGE).pot $(PO_FILES) LINGUAS POTFILES
+EXTRA_DIST = README $(GETTEXT_PACKAGE).pot LINGUAS POTFILES \
+	$(PO_FILES)
 @ENABLE_TRANSLATIONS_FALSE@INSTALL_TRANSLATIONS = 
 @ENABLE_TRANSLATIONS_TRUE@INSTALL_TRANSLATIONS = install-translations
 @ENABLE_TRANSLATIONS_FALSE@UNINSTALL_TRANSLATIONS =