From 55bd4a38ab04147c061deb7f40b18e482e9f905f Mon Sep 17 00:00:00 2001
From: Cyrille Bagard <nocbos@gmail.com>
Date: Thu, 30 Aug 2018 00:16:30 +0200
Subject: Fixed the dist rule in Makefiles.

---
 pixmaps/Makefile.am                    | 1 +
 plugins/arm/v7/opcodes/Makefile.am     | 5 ++++-
 plugins/dalvik/pseudo/Makefile.am      | 1 +
 plugins/dalvik/v35/opcodes/Makefile.am | 3 +++
 plugins/lnxsyscalls/Makefile.am        | 3 +++
 tools/d2c/Makefile.am                  | 2 +-
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 2ce41ff..eb3e6c2 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -51,6 +51,7 @@ EXTRA_DIST =							\
 	$(REVISION_PIX)						\
 	$(TOOLBAR_BUTTONS)					\
 	$(LIST_ICONS)						\
+	$(ERROR_ICONS)						\
 	$(MISC)
 
 pix_DATA = $(APP_ICONS) $(REVISION_PIX) $(TOOLBAR_BUTTONS) $(LIST_ICONS) $(ERROR_ICONS) $(MISC)
diff --git a/plugins/arm/v7/opcodes/Makefile.am b/plugins/arm/v7/opcodes/Makefile.am
index 13088e6..19c98c1 100644
--- a/plugins/arm/v7/opcodes/Makefile.am
+++ b/plugins/arm/v7/opcodes/Makefile.am
@@ -28,5 +28,8 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -I$(top_srcdir)
 
 CLEANFILES = $(GENERATED_FILES)
 
+dist-hook:
+	cd $(distdir) && rm -f $(CLEANFILES)
 
-EXTRA_DIST = opcodes_tmp_arm.h opcodes_tmp_simd.h opcodes_tmp_thumb_16.h opcodes_tmp_thumb_32.h
+
+EXTRA_DIST = opcodes_tmp_arm.h opcodes_tmp_thumb_16.h opcodes_tmp_thumb_32.h
diff --git a/plugins/dalvik/pseudo/Makefile.am b/plugins/dalvik/pseudo/Makefile.am
index 5db4b51..77a41f5 100644
--- a/plugins/dalvik/pseudo/Makefile.am
+++ b/plugins/dalvik/pseudo/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES = libdalvikpseudo.la
 
 libdalvikpseudo_la_SOURCES =			\
 	fill.h fill.c						\
+	identifiers.h						\
 	switch.h switch.c
 
 libdalvikpseudo_la_LIBADD = 
diff --git a/plugins/dalvik/v35/opcodes/Makefile.am b/plugins/dalvik/v35/opcodes/Makefile.am
index 9f4e51e..d0451ad 100644
--- a/plugins/dalvik/v35/opcodes/Makefile.am
+++ b/plugins/dalvik/v35/opcodes/Makefile.am
@@ -27,3 +27,6 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
 
 CLEANFILES = $(GENERATED_FILES)
+
+dist-hook:
+	cd $(distdir) && rm -f $(CLEANFILES)
diff --git a/plugins/lnxsyscalls/Makefile.am b/plugins/lnxsyscalls/Makefile.am
index 5ca358a..a68e18e 100644
--- a/plugins/lnxsyscalls/Makefile.am
+++ b/plugins/lnxsyscalls/Makefile.am
@@ -21,6 +21,9 @@ liblnxsyscalls_la_LDFLAGS =					\
 	-L$(top_srcdir)/plugins/arm/.libs -larm
 
 
+EXTRA_DIST = linux-syscalls.db
+
+
 db_DATA = linux-syscalls.db
 
 dbdir = $(pluginsdir)
diff --git a/tools/d2c/Makefile.am b/tools/d2c/Makefile.am
index c07e16f..e5cfef4 100644
--- a/tools/d2c/Makefile.am
+++ b/tools/d2c/Makefile.am
@@ -56,7 +56,7 @@ CLEANFILES = grammar.h grammar.c grammar.output tokens.c tokens.h
 
 # Pareil : de tous les fichiers générés, seule la sortie de Flex saute pour les distributions !
 # On rajoute également de quoi générer les Makefiles.
-EXTRA_DIST = tokens.h d2c_genmakefile.sh
+EXTRA_DIST = tokens.h d2c_genmakefile.sh d2c.mk
 
 
 SUBDIRS = args assert bits conv desc format hooks id pattern rules
-- 
cgit v0.11.2-87-g4458