diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-02-06 17:30:25 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-02-06 18:09:14 +0100 |
| commit | 498d6c2f3ac444c86e868b9116978aedf783174d (patch) | |
| tree | adfb528dabd8ec4bd1e9a7f017c4f50f7e306d8a | |
| parent | fb3cc15b1662f00c11d889584f6bc8e3a853c947 (diff) | |
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.
| -rw-r--r-- | Makefrag.am | 4 | ||||
| -rw-r--r-- | i386/Makefrag.am | 31 | ||||
| -rw-r--r-- | version.m4 | 2 | ||||
| -rw-r--r-- | x86_64/Makefrag.am | 27 |
4 files changed, 25 insertions, 39 deletions
diff --git a/Makefrag.am b/Makefrag.am index fef1e000..50e9b24b 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -610,11 +610,7 @@ endif # # ix86. -if HOST_ix86 include i386/Makefrag.am -endif # x86_64. -if HOST_x86_64 include x86_64/Makefrag.am -endif 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 @@ -1,4 +1,4 @@ m4_define([AC_PACKAGE_NAME],[GNU Mach]) -m4_define([AC_PACKAGE_VERSION],[1.8]) +m4_define([AC_PACKAGE_VERSION],[1.8+git20220206]) m4_define([AC_PACKAGE_BUGREPORT],[bug-hurd@gnu.org]) m4_define([AC_PACKAGE_TARNAME],[gnumach]) diff --git a/x86_64/Makefrag.am b/x86_64/Makefrag.am index 40b50bc9..713b2c76 100644 --- a/x86_64/Makefrag.am +++ b/x86_64/Makefrag.am @@ -14,6 +14,14 @@ # USE OF THIS SOFTWARE. # +# Building a distribution. +# +EXTRA_DIST += \ + x86_64/ldscript + +if HOST_x86_64 + +# # Source files for any x86_64 kernel. # @@ -147,8 +155,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 += \ @@ -196,8 +202,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 @@ -205,8 +209,6 @@ nodist_libkernel_a_SOURCES += \ # Architecture specialities. # -EXTRA_DIST += \ - x86_64/ldscript if PLATFORM_at gnumach_LINKFLAGS += \ --defsym _START_MAP=$(_START_MAP) \ @@ -251,17 +253,6 @@ include_mach_x86_64_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. # @@ -277,3 +268,5 @@ gnumach_LINKFLAGS += \ --defsym _START_MAP=0x40000000 \ -T '$(srcdir)'/x86_64/ldscript endif + +endif # HOST_x86_64 |