# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1516664457 -3600
# Node ID 4903104ff447ac92cfe1ab45b78aaea70e4f2357
# Parent  cf6d3d6a6dc22c2adeee0bcb6a347cc58f3a08be
Fixing automake build system

diff -r cf6d3d6a6dc2 -r 4903104ff447 Makefile.am
--- a/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -25,7 +25,6 @@
 
 EXTRA_DIST = \
 	$(readme_DATA)	\
-	$(desktop_DATA)	\
 	$(desktop_in_files)	\
 	$(icon_DATA)	\
 	geeqie.spec.in	\
@@ -36,6 +35,7 @@
 	cp $(top_builddir)/geeqie.spec $(distdir)
 
 DISTCLEANFILES = config.report
+CLEANFILES = $(desktop_DATA)
 
 .PHONY: ChangeLog
 ChangeLog.html:
diff -r cf6d3d6a6dc2 -r 4903104ff447 configure.in
--- a/configure.in	Mon Jan 22 21:08:23 2018 +0100
+++ b/configure.in	Tue Jan 23 00:40:57 2018 +0100
@@ -25,7 +25,7 @@
 
 AC_CONFIG_AUX_DIR(auxdir)
 # Require Automake 1.14 for %reldir% support
-AM_INIT_AUTOMAKE([1.14.1 subdir-objects foreign])
+AM_INIT_AUTOMAKE([1.14.1 subdir-objects foreign dist-xz no-dist-gzip])
 
 AC_CONFIG_HEADER([config.h])
 
diff -r cf6d3d6a6dc2 -r 4903104ff447 doc/Makefile.am
--- a/doc/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/doc/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -2,7 +2,7 @@
 
 helpdir = @htmldir@
 
-EXTRA_DIST = docbook2html.sh docbook
+EXTRA_DIST = docbook2html.sh docbook icons
 
 html/GuideIndex.html: docbook/GuideIndex.xml
 	rm -rf html; mkdir html; cp $(srcdir)/icons/* html/
@@ -20,7 +20,7 @@
 		cd $(srcdir)/html; for f in * ; do $(INSTALL_DATA) "$$f" "$(DESTDIR)$(helpdir)/$$f" ; done; \
 		ln -s -f GuideIndex.html "$(DESTDIR)$(helpdir)/index.html" ; \
 	fi
-	
+
 uninstall-hook:
 	rm "$(DESTDIR)$(helpdir)/"*
 
diff -r cf6d3d6a6dc2 -r 4903104ff447 plugins/import/Makefile.am
--- a/plugins/import/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/plugins/import/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -5,4 +5,5 @@
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(gq_desktop_DATA) $(gq_desktop_in_files)
+EXTRA_DIST = $(gq_desktop_in_files)
+CLEANFILES = $(gq_desktop_DATA)
diff -r cf6d3d6a6dc2 -r 4903104ff447 plugins/rotate/Makefile.am
--- a/plugins/rotate/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/plugins/rotate/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -5,5 +5,6 @@
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(gq_desktop_DATA) $(gq_desktop_in_files)
+EXTRA_DIST = $(gq_desktop_in_files)
+CLEANFILES = $(gq_desktop_DATA)
 
diff -r cf6d3d6a6dc2 -r 4903104ff447 plugins/symlink/Makefile.am
--- a/plugins/symlink/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/plugins/symlink/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -5,4 +5,5 @@
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(gq_desktop_DATA) $(gq_desktop_in_files)
+EXTRA_DIST = $(gq_desktop_in_files)
+CLEANFILES = $(gq_desktop_DATA)
diff -r cf6d3d6a6dc2 -r 4903104ff447 plugins/ufraw/Makefile.am
--- a/plugins/ufraw/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/plugins/ufraw/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -8,5 +8,6 @@
 gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(gq_desktop_DATA) $(gq_desktop_in_files)
+EXTRA_DIST = $(gq_desktop_in_files)
+CLEANFILES = $(gq_desktop_DATA)
 
diff -r cf6d3d6a6dc2 -r 4903104ff447 src/Makefile.am
--- a/src/Makefile.am	Mon Jan 22 21:08:23 2018 +0100
+++ b/src/Makefile.am	Tue Jan 23 00:40:57 2018 +0100
@@ -195,6 +195,7 @@
 	layout_image.h	\
 	layout_util.c	\
 	layout_util.h	\
+	keymap_template.c\
 	lirc.c		\
 	lirc.h		\
 	logwindow.c	\
diff -r cf6d3d6a6dc2 -r 4903104ff447 src/keymap_template.c
--- a/src/keymap_template.c	Mon Jan 22 21:08:23 2018 +0100
+++ b/src/keymap_template.c	Tue Jan 23 00:40:57 2018 +0100
@@ -19,6 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <stddef.h>
+
 static char *keymap_template [] = {
 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>",
 "<!-- Created with Inkscape (http://www.inkscape.org/) -->",