From 0058f7712f440492d9ffbd685766e6605aba87cc Mon Sep 17 00:00:00 2001 From: okuji Date: Sat, 19 Mar 2005 17:49:19 +0000 Subject: [PATCH] 2005-03-19 Yoshinori K. Okuji * DISTLIST: New file. * gendistlist.sh: Likewise. * Makefile.in (COMMON_DISTFILES): Removed. (BOOT_DISTFILES): Likewise. (CONF_DISTFILES): Likewise. (DISK_DISTFILES): Likewise. (FS_DISTFILES): Likewise. (INCLUDE_DISTFILES): Likewise. (KERN_DISTFILES): Likewise. (LOADER_DISTFILES): Likewise. (TERM_DISTFILES): Likewise. (UTIL_DISTFILES): Likewise. (DISTFILES): Likewise. (uninstall): Uninstall files in $(pkgdata_DATA). (DISTLIST): New target. (distdir): Use the contents of the file DISTLIST to get a list of distributed files. --- ChangeLog | 21 ++++++ DISTLIST | 177 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.in | 51 ++------------ gendistlist.sh | 32 +++++++++ 4 files changed, 237 insertions(+), 44 deletions(-) create mode 100644 DISTLIST create mode 100644 gendistlist.sh diff --git a/ChangeLog b/ChangeLog index ddbd96982..32b610efa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2005-03-19 Yoshinori K. Okuji + + * DISTLIST: New file. + * gendistlist.sh: Likewise. + + * Makefile.in (COMMON_DISTFILES): Removed. + (BOOT_DISTFILES): Likewise. + (CONF_DISTFILES): Likewise. + (DISK_DISTFILES): Likewise. + (FS_DISTFILES): Likewise. + (INCLUDE_DISTFILES): Likewise. + (KERN_DISTFILES): Likewise. + (LOADER_DISTFILES): Likewise. + (TERM_DISTFILES): Likewise. + (UTIL_DISTFILES): Likewise. + (DISTFILES): Likewise. + (uninstall): Uninstall files in $(pkgdata_DATA). + (DISTLIST): New target. + (distdir): Use the contents of the file DISTLIST to get a list of + distributed files. + 2005-03-18 Yoshinori K. Okuji * fs/fat.c (grub_fat_mount): Ignore the 3rd bit of a media diff --git a/DISTLIST b/DISTLIST new file mode 100644 index 000000000..8e2a31eec --- /dev/null +++ b/DISTLIST @@ -0,0 +1,177 @@ +AUTHORS +COPYING +ChangeLog +DISTLIST +INSTALL +NEWS +README +THANKS +TODO +Makefile.in +aclocal.m4 +autogen.sh +config.guess +config.h.in +config.sub +configure +configure.ac +gencmdlist.sh +gendistlist.sh +genkernsyms.sh +genmk.rb +genmodsrc.sh +gensymlist.sh +install-sh +mkinstalldirs +stamp-h.in +boot/i386/pc/boot.S +boot/i386/pc/diskboot.S +boot/i386/pc/pxeboot.S +boot/powerpc/ieee1275/cmain.c +boot/powerpc/ieee1275/crt0.S +boot/powerpc/ieee1275/ieee1275.c +commands/i386/pc/halt.c +commands/i386/pc/reboot.c +commands/ieee1275/halt.c +commands/ieee1275/reboot.c +commands/ieee1275/suspend.c +commands/boot.c +commands/cat.c +commands/cmp.c +commands/configfile.c +commands/default.c +commands/help.c +commands/ls.c +commands/terminal.c +commands/timeout.c +conf/i386-pc.mk +conf/i386-pc.rmk +conf/powerpc-ieee1275.mk +conf/powerpc-ieee1275.rmk +disk/i386/pc/biosdisk.c +disk/powerpc/ieee1275/ofdisk.c +disk/loopback.c +font/manager.c +fs/ext2.c +fs/fat.c +fs/fshelp.c +fs/hfs.c +fs/iso9660.c +fs/jfs.c +fs/minix.c +fs/ufs.c +hello/hello.c +include/grub/i386/pc/util/biosdisk.h +include/grub/i386/pc/biosdisk.h +include/grub/i386/pc/boot.h +include/grub/i386/pc/chainloader.h +include/grub/i386/pc/console.h +include/grub/i386/pc/init.h +include/grub/i386/pc/kernel.h +include/grub/i386/pc/linux.h +include/grub/i386/pc/loader.h +include/grub/i386/pc/memory.h +include/grub/i386/pc/multiboot.h +include/grub/i386/pc/time.h +include/grub/i386/pc/vga.h +include/grub/i386/setjmp.h +include/grub/i386/types.h +include/grub/powerpc/ieee1275/util/biosdisk.h +include/grub/powerpc/ieee1275/biosdisk.h +include/grub/powerpc/ieee1275/console.h +include/grub/powerpc/ieee1275/ieee1275.h +include/grub/powerpc/ieee1275/init.h +include/grub/powerpc/ieee1275/kernel.h +include/grub/powerpc/ieee1275/loader.h +include/grub/powerpc/ieee1275/multiboot.h +include/grub/powerpc/ieee1275/time.h +include/grub/powerpc/libgcc.h +include/grub/powerpc/setjmp.h +include/grub/powerpc/types.h +include/grub/util/getroot.h +include/grub/util/misc.h +include/grub/util/resolve.h +include/grub/arg.h +include/grub/boot.h +include/grub/cache.h +include/grub/device.h +include/grub/disk.h +include/grub/dl.h +include/grub/elf.h +include/grub/env.h +include/grub/err.h +include/grub/file.h +include/grub/font.h +include/grub/fs.h +include/grub/fshelp.h +include/grub/kernel.h +include/grub/loader.h +include/grub/misc.h +include/grub/mm.h +include/grub/net.h +include/grub/normal.h +include/grub/partition.h +include/grub/pc_partition.h +include/grub/rescue.h +include/grub/setjmp.h +include/grub/symbol.h +include/grub/term.h +include/grub/types.h +kern/i386/pc/init.c +kern/i386/pc/lzo1x.S +kern/i386/pc/startup.S +kern/i386/dl.c +kern/powerpc/ieee1275/init.c +kern/powerpc/ieee1275/openfw.c +kern/powerpc/cache.S +kern/powerpc/dl.c +kern/device.c +kern/disk.c +kern/dl.c +kern/env.c +kern/err.c +kern/file.c +kern/fs.c +kern/loader.c +kern/main.c +kern/misc.c +kern/mm.c +kern/partition.c +kern/rescue.c +kern/term.c +loader/i386/pc/chainloader.c +loader/i386/pc/chainloader_normal.c +loader/i386/pc/linux.c +loader/i386/pc/linux_normal.c +loader/i386/pc/multiboot.c +loader/i386/pc/multiboot_normal.c +loader/powerpc/ieee1275/linux.c +loader/powerpc/ieee1275/linux_normal.c +normal/i386/setjmp.S +normal/powerpc/setjmp.S +normal/arg.c +normal/cmdline.c +normal/command.c +normal/context.c +normal/main.c +normal/menu.c +normal/menu_entry.c +partmap/amiga.c +partmap/apple.c +partmap/pc.c +partmap/sun.c +term/i386/pc/console.c +term/i386/pc/vga.c +term/powerpc/ieee1275/ofconsole.c +util/i386/pc/biosdisk.c +util/i386/pc/getroot.c +util/i386/pc/grub-mkimage.c +util/i386/pc/grub-setup.c +util/i386/pc/misc.c +util/powerpc/ieee1275/grub-mkimage.c +util/console.c +util/genmoddep.c +util/grub-emu.c +util/misc.c +util/resolve.c +util/unifont2pff.rb diff --git a/Makefile.in b/Makefile.in index 4ff6a5c1f..68a93f954 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,47 +72,6 @@ RUBY = @RUBY@ RMKFILES = $(addprefix conf/,i386-pc.rmk powerpc-ieee1275.rmk) MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES)) -COMMON_DISTFILES = AUTHORS COPYING ChangeLog INSTALL NEWS README \ - THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \ - config.h.in config.sub configure configure.ac gencmdlist.sh \ - genkernsyms.sh genmk.rb genmodsrc.sh gensymlist.sh install-sh \ - mkinstalldirs stamp-h.in - -BOOT_DISTFILES = $(addprefix boot/i386/pc/,boot.S diskboot.S) - -CONF_DISTFILES = $(RMKFILES) $(MKFILES) - -DISK_DISTFILES = $(addprefix disk/i386/pc/,biosdisk.c partition.c) - -FS_DISTFILES = $(addprefix fs/,fat.c) - -INCLUDE_DISTFILES = $(addprefix include/grub/,boot.h device.h disk.h \ - dl.h elf.h err.h file.h fs.h kernel.h loader.h misc.h mm.h \ - net.h rescue.h symbol.h term.h types.h) \ - $(addprefix include/grub/util/,misc.h resolve.h) \ - include/grub/i386/types.h \ - $(addprefix include/grub/i386/pc/,biosdisk.h boot.h \ - console.h init.h kernel.h loader.h memory.h partition.h) \ - $(addprefix include/grub/i386/pc/util/,biosdisk.h) - -KERN_DISTFILES = $(addprefix kern/,device.c disk.c dl.c err.c file.c \ - fs.c loader.c main.c misc.c mm.c rescue.c term.c) \ - kern/i386/dl.c \ - $(addprefix kern/i386/pc/,init.c startup.S) - -LOADER_DISTFILES = $(addprefix loader/i386/pc/,chainloader.c) - -TERM_DISTFILES = $(addprefix term/i386/pc/,console.c) - -UTIL_DISTFILES = $(addprefix util/,genmoddep.c misc.c resolve.c) \ - $(addprefix util/i386/pc/,biosdisk.c grub-mkimage.c \ - grub-setup.c) - -DISTFILES = $(COMMON_DISTFILES) $(BOOT_DISTFILES) $(CONF_DISTFILES) \ - $(DISK_DISTFILES) $(FS_DISTFILES) $(INCLUDE_DISTFILES) \ - $(KERN_DISTFILES) $(LOADER_DISTFILES) $(TERM_DISTFILES) \ - $(UTIL_DISTFILES) - DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \ $(pkgdata_DATA) PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES) @@ -168,7 +127,8 @@ install-strip: $(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install uninstall: - @list='$(pkgdata_IMAGES) $(pkgdata_MODULES)'; for file in $$list; do \ + @list='$(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_DATA)'; \ + for file in $$list; do \ dest="`echo $$file | sed 's,.*/,,'`"; \ rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \ done @@ -200,10 +160,13 @@ dvi: distdir=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -distdir: $(DISTFILES) +DISTLIST: gendistlist.sh + sh $(srcdir)/gendistlist.sh > $(srcdir)/DISTLIST + +distdir: DISTLIST -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) $(mkinstalldirs) $(distdir) - for i in $(DISTFILES); do \ + for i in `cat $(srcdir)/DISTLIST`; do \ dir=`echo "$$i" | sed 's:/[^/]*$$::'`; \ if test -d $(srcdir)/$$dir; then \ $(mkinstalldirs) $(distdir)/$$dir; \ diff --git a/gendistlist.sh b/gendistlist.sh new file mode 100644 index 000000000..4f99beaca --- /dev/null +++ b/gendistlist.sh @@ -0,0 +1,32 @@ +#! /bin/sh +# +# Copyright (C) 2005 Free Software Foundation, Inc. +# +# This gendistlist.sh is free software; the author +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# Generate a list of distributed files. + +EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \ + THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \ + config.h.in config.sub configure configure.ac gencmdlist.sh \ + gendistlist.sh genkernsyms.sh genmk.rb genmodsrc.sh gensymlist.sh \ + install-sh mkinstalldirs stamp-h.in" + +DISTDIRS="boot commands conf disk font fs hello include kern loader \ + normal partmap term util" + +for f in $EXTRA_DISTFILES; do + echo $f +done + +dir=`dirname $0` +cd $dir + +find $DISTDIRS -name '*.[chS]' -o -name '*.mk' -o -name '*.rmk' -o -name '*.rb' \ No newline at end of file