Fixing automake build system

diff --git a/Makefile.am b/Makefile.am
index 113719b..d2d3b84 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ icon_DATA = geeqie.png
 
 EXTRA_DIST = \
        $(readme_DATA)  \
-       $(desktop_DATA) \
        $(desktop_in_files)     \
        $(icon_DATA)    \
        geeqie.spec.in  \
@@ -36,6 +35,7 @@ dist-hook: geeqie.spec
        cp $(top_builddir)/geeqie.spec $(distdir)
 
 DISTCLEANFILES = config.report
+CLEANFILES = $(desktop_DATA)
 
 .PHONY: ChangeLog
 ChangeLog.html:

diff --git a/configure.in b/configure.in
index 0b6bc1b..c89ca35 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ AC_CONFIG_SRCDIR([src/main.c])
 
 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 --git a/doc/Makefile.am b/doc/Makefile.am
index 6dc4079..54b442d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -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 @@ install-data-hook: html
                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 --git a/plugins/import/Makefile.am b/plugins/import/Makefile.am
index e003c5a..e9dc90b 100644 (file)
--- a/plugins/import/Makefile.am
+++ b/plugins/import/Makefile.am
@@ -5,4 +5,5 @@ gq_desktop_in_files = geeqie-import-geeqie.desktop.in geeqie-import-gqview.deskt
 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 --git a/plugins/rotate/Makefile.am b/plugins/rotate/Makefile.am
index 8fd4372..0722744 100644 (file)
--- a/plugins/rotate/Makefile.am
+++ b/plugins/rotate/Makefile.am
@@ -5,5 +5,6 @@ gq_desktop_in_files = rotate.desktop.in
 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 --git a/plugins/symlink/Makefile.am b/plugins/symlink/Makefile.am
index d783c20..0e9039c 100644 (file)
--- a/plugins/symlink/Makefile.am
+++ b/plugins/symlink/Makefile.am
@@ -5,4 +5,5 @@ gq_desktop_in_files = symlink.desktop.in
 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 --git a/plugins/ufraw/Makefile.am b/plugins/ufraw/Makefile.am
index 2317a06..eae6ee7 100644 (file)
--- a/plugins/ufraw/Makefile.am
+++ b/plugins/ufraw/Makefile.am
@@ -8,5 +8,6 @@ gq_desktop_in_files = geeqie-ufraw-recursive.desktop.in \
 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 --git a/src/Makefile.am b/src/Makefile.am
index cc0e7ea..2697cc7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -195,6 +195,7 @@ geeqie_SOURCES = \
        layout_image.h  \
        layout_util.c   \
        layout_util.h   \
+       keymap_template.c\
        lirc.c          \
        lirc.h          \
        logwindow.c     \

diff --git a/src/keymap_template.c b/src/keymap_template.c
index d45917c..f7b4506 100644 (file)
--- a/src/keymap_template.c
+++ b/src/keymap_template.c
@@ -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/) -->",