From 498d6c2f3ac444c86e868b9116978aedf783174d Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 6 Feb 2022 17:30:25 +0100
Subject: Makefrag.am: Move architecture condition inside architecture
 Makefrag.am

Otherwise we cannot use _DIST there and have them all taken into account.
As a consequence, we can drop duplicate _DIST between i386 and x86_64.
---
 i386/Makefrag.am | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'i386')

diff --git a/i386/Makefrag.am b/i386/Makefrag.am
index 679c0a3d..c1043c4f 100644
--- a/i386/Makefrag.am
+++ b/i386/Makefrag.am
@@ -14,6 +14,18 @@
 # USE OF THIS SOFTWARE.
 
 #
+# Building a distribution.
+#
+EXTRA_DIST += \
+	i386/i386/mach_i386.srv \
+	i386/i386/i386asm.sym \
+	i386/ldscript \
+	i386/README-Drivers \
+	i386/include
+
+if HOST_ix86
+
+#
 # Source files for any i386 kernel.
 #
 
@@ -150,8 +162,6 @@ libkernel_a_SOURCES += \
 	i386/intel/pmap.h \
 	i386/intel/read_fault.c \
 	i386/intel/read_fault.h
-EXTRA_DIST += \
-	i386/i386/mach_i386.srv
 
 if PLATFORM_at
 libkernel_a_SOURCES += \
@@ -209,8 +219,6 @@ nodist_libkernel_a_SOURCES += \
 	i386/i386/mach_i386.server.msgids
 #	i386/i386/mach_i386.server.defs
 
-EXTRA_DIST += \
-	i386/i386/i386asm.sym
 nodist_libkernel_a_SOURCES += \
 	i386/i386/i386asm.h
 
@@ -218,8 +226,6 @@ nodist_libkernel_a_SOURCES += \
 # Architecture specialities.
 #
 
-EXTRA_DIST += \
-	i386/ldscript
 if PLATFORM_at
 gnumach_LINKFLAGS += \
 	--defsym _START_MAP=$(_START_MAP) \
@@ -257,17 +263,6 @@ include_mach_i386_HEADERS = \
 	i386/include/mach/i386/vm_types.h
 
 #
-# Building a distribution.
-#
-
-EXTRA_DIST += \
-	i386/README-Drivers
-
-# Instead of listing each file individually...
-EXTRA_DIST += \
-	i386/include
-
-#
 # Platform specific parts.
 #
 
@@ -278,3 +273,5 @@ libkernel_a_SOURCES += \
 	i386/i386/xen.h
 
 endif
+
+endif # HOST_i386
-- 
cgit v1.2.3