Fixed the creation of distribution tarballs.

5 files changed, 26 insertions, 1 deletions

diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index a7ff3a2..58474d7 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -19,7 +19,6 @@ libarch_la_SOURCES =					\
 	register-int.h						\
 	register.h register.c				\
 	target.h target.c					\
-	translate.h							\
 	undefined.h undefined.c				\
 	vmpa.h vmpa.c
 
diff --git a/src/arch/arm/Makefile.am b/src/arch/arm/Makefile.am
index c0bbdf7..496872a 100644
--- a/src/arch/arm/Makefile.am
+++ b/src/arch/arm/Makefile.am
@@ -8,6 +8,7 @@ libarcharm_la_SOURCES =					\
 	instruction-int.h					\
 	instruction.h instruction.c			\
 	link.h link.c						\
+	processor-int.h						\
 	processor.h processor.c				\
 	register-int.h						\
 	register.h register.c
diff --git a/src/arch/arm/v7/opcodes/Makefile.am b/src/arch/arm/v7/opcodes/Makefile.am
index a7313b1..fb00143 100644
--- a/src/arch/arm/v7/opcodes/Makefile.am
+++ b/src/arch/arm/v7/opcodes/Makefile.am
@@ -21,3 +21,6 @@ libarcharmv7opcodes_la_CFLAGS = $(AM_CFLAGS)
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+
+EXTRA_DIST = opcodes_tmp_arm.h opcodes_tmp_simd.h opcodes_tmp_thumb_16.h opcodes_tmp_thumb_32.h
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index 41785c6..a702d10 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -279,6 +279,17 @@ ARMV7_DEFS = 							\
 
 #	subs_B9320.d
 
+# make dist procède répertoire par répertoire. Or le répertoire opcodes utilise
+# le contenu du répertoire opdefs. Il faut donc générer les fichiers nécessaires
+# au répertoire opcodes. Et comme on ne peut pas compléter la règle dist, on
+# ajoute à la distribution les cibles marquant la génération. (1/2)
+
+EXTRA_DIST = $(ARMV7_DEFS) $(ARMV7_DEFS:.d=.g)
+
+# Après coup, on supprime les fichiers inutiles de la distribution/ (2/2)
+
+dist-hook:
+	cd $(distdir) && rm $(ARMV7_DEFS:.d=.g)
 
 all: $(ARMV7_DEFS:.d=.g) fmk.done d2c_final_rules
 
diff --git a/src/arch/dalvik/opdefs/Makefile.am b/src/arch/dalvik/opdefs/Makefile.am
index 055e8a4..822e593 100644
--- a/src/arch/dalvik/opdefs/Makefile.am
+++ b/src/arch/dalvik/opdefs/Makefile.am
@@ -263,6 +263,17 @@ DALVIK_DEFS = 							\
 	shr_e1.d							\
 	ushr_e2.d
 
+# make dist procède répertoire par répertoire. Or le répertoire opcodes utilise
+# le contenu du répertoire opdefs. Il faut donc générer les fichiers nécessaires
+# au répertoire opcodes. Et comme on ne peut pas compléter la règle dist, on
+# ajoute à la distribution les cibles marquant la génération. (1/2)
+
+EXTRA_DIST = $(DALVIK_DEFS) $(DALVIK_DEFS:.d=.g)
+
+# Après coup, on supprime les fichiers inutiles de la distribution/ (2/2)
+
+dist-hook:
+	cd $(distdir) && rm $(DALVIK_DEFS:.d=.g)
 
 all: $(DALVIK_DEFS:.d=.g) fmk.done d2c_final_rules