From 50bfb9acf98d5f4c0c5948cc28285e990b40b659 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sun, 8 Apr 2012 23:10:42 +0200 Subject: Replace fragile manual »make dist« system with one based on »git archive«. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makeconf (lndist): Remove target. (dist-hook, dist.tar): New targets. * Makefile (dist): Rewrite this target's as well as accompanying rules. (%-lndist, cp-linked-files, $(lf-inst)): Remove targets. (%.bz2, %.gz, %/dist-hook): New targets. (DISTFILES): Set. * doc/Makefile (DISTFILES): Set. * doc/Makefile (lndist, lndist-info-targets): Remove targets. * include/Makefile (lndist): Remove target. * libthreads/Makefile (lndist, lndist-i386-files, lndist-map-file): Remove targets. * pfinet/Makefile (lndist, lndist-linux-src-net-core-files) (lndist-linux-src-net-ethernet-files, lndist-linux-src-net-ipv4-files) (lndist-linux-src-net-ipv6-files, lndist-linux-src-asm-files) (lndist-linux-src-include-linux-files, lndist-linux-src-include-net-files) (lndist-linux-src-include-asm-files, lndist-glue-include-linux-files) (lndist-glue-include-asm-files): Remove targets. * auth/Makefile (LCLHDRS): Don't set. * boot/Makefile (LCLHDRS, DIST_FILES): Likewise. * bsdfsck/Makefile (LCLHDRS): Likewise. * config/Makefile (DIST_FILES): Likewise. * console-client/Makefile (LCLHDRS): Likewise. * console/Makefile (LCLHDRS, DIST_FILES): Likewise. * doc/Makefile (DIST_FILES): Likewise. * exec/Makefile (LCLHDRS, DIST_FILES): Likewise. * ext2fs/Makefile (LCLHDRS): Likewise. * fatfs/Makefile (LCLHDRS): Likewise. * ftpfs/Makefile (LCLHDRS): Likewise. * hostmux/Makefile (LCLHDRS): Likewise. * hurd/Makefile (DIST_FILES): Likewise. * include/Makefile (LCLHDRS): Likewise. * isofs/Makefile (LCLHDRS, DIST_FILES): Likewise. * libcons/Makefile (LCLHDRS): Likewise. * libdirmgt/Makefile (LCLHDRS): Likewise. * libdiskfs/Makefile (LCLHDRS): Likewise. * libfshelp/Makefile (LCLHDRS): Likewise. * libftpconn/Makefile (LCLHDRS): Likewise. * libihash/Makefile (LCLHDRS): Likewise. * libiohelp/Makefile (LCLHDRS): Likewise. * libnetfs/Makefile (LCLHDRS): Likewise. * libpager/Makefile (LCLHDRS): Likewise. * libpipe/Makefile (LCLHDRS): Likewise. * libports/Makefile (LCLHDRS): Likewise. * libps/Makefile (LCLHDRS): Likewise. * libshouldbeinlibc/Makefile (LCLHDRS): Likewise. * libstore/Makefile (LCLHDRS, DIST_FILES): Likewise. * libthreads/Makefile (LCLHDRS): Likewise. * libtreefs/Makefile (LCLHDRS): Likewise. * libtrivfs/Makefile (LCLHDRS): Likewise. * mach-defpager/Makefile (LCLHDRS): Likewise. * nfs/Makefile (LCLHDRS): Likewise. * nfsd/Makefile (LCLHDRS): Likewise. * pfinet/Makefile (LCLHDRS): Likewise. * pflocal/Makefile (LCLHDRS): Likewise. * proc/Makefile (LCLHDRS, DIST_FILES): Likewise. * release/Makefile (DIST_FILES): Likewise. * storeio/Makefile (LCLHDRS): Likewise. * sutils/Makefile (LCLHDRS): Likewise. * term/Makefile (LCLHDRS, DIST_FILES): Likewise. * tmpfs/Makefile (LCLHDRS): Likewise. * ufs-fsck/Makefile (LCLHDRS): Likewise. * ufs/Makefile (LCLHDRS): Likewise. * usermux/Makefile (LCLHDRS): Likewise. * utils/Makefile (LCLHDRS): Likewise. --- pfinet/Makefile | 65 ++------------------------------------------------------- 1 file changed, 2 insertions(+), 63 deletions(-) (limited to 'pfinet') diff --git a/pfinet/Makefile b/pfinet/Makefile index 0874eee3..48b47915 100644 --- a/pfinet/Makefile +++ b/pfinet/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 1995, 1996, 1997, 2000, 2007, 2011 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 2000, 2007, 2011, 2012 Free Software +# Foundation, Inc. # # This file is part of the GNU Hurd. # @@ -90,7 +90,6 @@ MIGSRCS = ioServer.c socketServer.c startup_notifyServer.c \ pfinetServer.c iioctlServer.c OBJS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,\ $(LINUXSRCS) $(ARCHSRCS) $(SRCS) $(MIGSRCS))) -LCLHDRS = config.h mapped-time.h mutations.h pfinet.h LINUXHDRS = bitops.h capability.h delay.h errqueue.h etherdevice.h \ fddidevice.h firewall.h icmp.h icmpv6.h if_arp.h if_ether.h \ if_fddi.h if_packet.h if_ppp.h if_tunnel.h if_tr.h \ @@ -145,63 +144,3 @@ socket-MIGSFLAGS = -imacros $(srcdir)/mutations.h # cpp doesn't automatically make dependencies for -imacros dependencies. argh. io_S.h ioServer.c socket_S.h socketServer.c: mutations.h $(OBJS): config.h - -lndist: lndist-linux-src-net-core-files lndist-linux-src-net-ethernet-files lndist-linux-src-net-ipv4-files lndist-linux-src-net-ipv6-files lndist-linux-src-asm-files lndist-linux-src-include-asm-files lndist-linux-src-include-linux-files lndist-linux-src-include-net-files lndist-glue-include-linux-files lndist-glue-include-asm-files - -lndist-linux-src-net-core-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net/core - ln $(addprefix $(srcdir)/linux-src/net/core/,$(core-srcs)) $< - -lndist-linux-src-net-ethernet-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net/ethernet - ln $(addprefix $(srcdir)/linux-src/net/ethernet/,$(ethernet-srcs)) $< - -lndist-linux-src-net-ipv4-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net/ipv4 - ln $(addprefix $(srcdir)/linux-src/net/ipv4/,$(ipv4-srcs)) $< - -lndist-linux-src-net-ipv6-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net/ipv6 - ln $(addprefix $(srcdir)/linux-src/net/ipv6/,$(ipv6-srcs)) $< - -# FIXME !i386 -lndist-linux-src-asm-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/arch/i386/lib - ln $(addprefix $(srcdir)/linux-src/arch/i386/lib/,$(ARCHSRCS)) $< - -lndist-linux-src-include-linux-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/include/linux - ln $(addprefix $(srcdir)/linux-src/include/linux/,$(LINUXHDRS)) $< - -lndist-linux-src-include-net-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/include/net - ln $(addprefix $(srcdir)/linux-src/include/net/,$(LINUXNETHDRS)) $< - -lndist-linux-src-include-asm-files: $(top_srcdir)/hurd-snap/$(dir)/linux-src/include/asm-i386 - ln $(addprefix $(srcdir)/linux-src/include/asm-$(asm_syntax)/,$(ARCHHDRS)) $< - -lndist-glue-include-linux-files: $(top_srcdir)/hurd-snap/$(dir)/glue-include/linux - ln $(addprefix $(srcdir)/glue-include/linux/,$(FROBBEDLINUXHEADERS)) $< - -lndist-glue-include-asm-files: $(top_srcdir)/hurd-snap/$(dir)/glue-include/asm - ln $(addprefix $(srcdir)/glue-include/asm/,$(ASMHEADERS)) $< - -$(top_srcdir)/hurd-snap/$(dir)/linux-src: - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/arch: $(top_srcdir)/hurd-snap/$(dir)/linux-src - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/arch/%/lib: $(top_srcdir)/hurd-snap/$(dir)/linux-src/arch - mkdir -p $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/include: $(top_srcdir)/hurd-snap/$(dir)/linux-src - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/include/%: $(top_srcdir)/hurd-snap/$(dir)/linux-src/include - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/net: $(top_srcdir)/hurd-snap/$(dir)/linux-src - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/net/core: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/net/ethernet: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/net/ipv4: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/linux-src/net/ipv6: $(top_srcdir)/hurd-snap/$(dir)/linux-src/net - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/glue-include: - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/glue-include/asm: $(top_srcdir)/hurd-snap/$(dir)/glue-include - mkdir $@ -$(top_srcdir)/hurd-snap/$(dir)/glue-include/linux: $(top_srcdir)/hurd-snap/$(dir)/glue-include - mkdir $@ -- cgit v1.2.3