diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-04-08 23:10:42 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-04-08 23:10:42 +0200 |
| commit | 50bfb9acf98d5f4c0c5948cc28285e990b40b659 (patch) | |
| tree | 404988f522437c2a9c84a3a70a8e7e6584ebe9e1 | |
| parent | a4df9fbd1e22a75eda2959765e58888dbcc6e42b (diff) | |
Replace fragile manual »make dist« system with one based on »git archive«.
* 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.
49 files changed, 127 insertions, 272 deletions
@@ -1,4 +1,4 @@ -# Generic configuration for Hurd compilation +# Generic configuration for Hurd compilation -*- makefile-gmake -*- # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, # 2006, 2007, 2008, 2010, 2011, 2012 Free Software Foundation, Inc. @@ -27,12 +27,12 @@ # Every makefile should define # SRCS (all actual source code) -# LCLHDRS (all source headers in this directory [NOT MiG created]) # OBJS (all .o files used to produce some target). # HURDLIBS (all Hurd libraries used; with no directory name or `lib' attached) # For types `server' and `utility' an automatic dependency will be # written for these, and type `library' will include a .so dependency. # Types `servers' and `utilities'; you have to do it yourself. +# DISTFILES (any built files to be included in distributions). # Types `server' and `utility' should define # target (the name of the program built) @@ -219,7 +219,7 @@ BUGADDR_REF = -uargp_program_bug_address # Standard targets -.PHONY: all install libs relink clean objs +.PHONY: all install libs relink dist-hook clean objs # Just build all the object files. objs: $(OBJS) @@ -403,18 +403,6 @@ $(..)$(dir).d: $(srcdir)/Makefile rm -f $@ echo $(dir): $(hurd-bug-addr-dir-dep) $(addprefix lib,$(HURDLIBS)) > $@ -# Making a snapshot -distfiles = Makefile $(SRCS) $(LCLHDRS) $(DIST_FILES) -lndist: $(distfiles) $(top_srcdir)/hurd-snap/$(dir) FORCE - ln $(addprefix $(srcdir)/,$(distfiles)) $(top_srcdir)/hurd-snap/$(dir) - -ifeq ($(dir),.) -$(top_srcdir)/hurd-snap/$(dir): -else -$(top_srcdir)/hurd-snap/$(dir): - mkdir $@ -endif - # TAGS files ifneq ($(dir),.) ifdef configured @@ -442,19 +430,41 @@ endif endif endif +.PHONY: dist-hook +ifdef DISTFILES +dist-hook: dist.tar +else +# Don't bother creating an empty tarball. +dist-hook: +endif + +# FORCE is needed as $(dist-version) can change between two invocations. +dist.tar: $(DISTFILES) FORCE + @[ x$(dist-version) != x ] || \ + { echo >&2 Can\''t make $@ without dist-version set.' && \ + false; } + tar -c -f $@ --files-from=/dev/null +# Every file from $(DISTFILES) can exist either in the build directory or in +# the source directory, but that must not affect the name it gets in dist.tar. + for f in $(DISTFILES); do \ + if test -e "$$f"; then d=.; else d=$(srcdir); fi && \ + tar --append -f $@ \ + --transform=s%^%$(dist-version)/$(dir)/% -C "$$d" "$$f" \ + || exit $$?; \ + done + # Cleaning -ifeq ($(clean),yes) clean: + rm -f dist.tar +ifeq ($(clean),yes) rm -f *.d *.o *Server.c *User.c *_S.h *_U.h *.[su]defsi \ $(cleantarg) -relink: - rm -f $(linktarg) endif -clean: relink: - - +ifeq ($(clean),yes) + rm -f $(linktarg) +endif # Subdependencies @@ -19,12 +19,9 @@ dir := . makemode := misc -include ./Makeconf - -DIST_FILES = ChangeLog COPYING Makeconf config.make.in configure.in configure \ - move-if-change hurd.boot build.mk.in build.mkcf.in aclocal.m4 \ - README NEWS tasks INSTALL INSTALL-cross version.h.in +DISTFILES := configure +include ./Makeconf ## Subdirectories of this directory should all be mentioned here @@ -52,9 +49,6 @@ other-subdirs = hurd doc config release include # All the subdirectories together subdirs = $(lib-subdirs) $(prog-subdirs) $(other-subdirs) -# Any subdirectories here that we don't want to distribute to the world -subdirs-nodist = - # This allows the creation of a file BROKEN in any of the prog-subdirs; # that will prevent this top level Makefile from attempting to make it. working-prog-subdirs := $(filter-out \ @@ -70,17 +64,35 @@ $(subdirs): version.h all: $(lib-subdirs) $(working-prog-subdirs) -# Create a distribution tar file. Set make variable `version' on the -# command line; otherwise the tar file will be a dated snapshot. -ifeq ($(version),) -version:=$(shell date +%Y%m%d) +# Create a distribution tar file. + +git_describe := git describe --match '*release*' +dist-version := $(shell cd $(top_srcdir)/ && $(git_describe)) + +.PHONY: dist +ifdef configured +dist: $(foreach Z,bz2 gz,$(dist-version).tar.$(Z)) +else +dist: + @echo >&2 'Cannot build a distribution from an unconfigured tree.' + false endif -dirname:=hurd -dist: $(srcdir)/hurd-snap $(addsuffix -lndist,$(filter-out $(subdirs-nodist), $(subdirs))) lndist - mv $(srcdir)/hurd-snap $(srcdir)/$(dirname)-$(version) - cd $(srcdir); tar cfz $(dirname)-$(version).tar.gz $(dirname)-$(version) - rm -rf $(srcdir)/$(dirname)-$(version) +HEAD.tar: FORCE + cd $(top_srcdir)/ && git status --short \ + | $(AWK) '{ print; rc=1 } END { exit rc }' \ + || { echo >&2 \ + 'Refusing to build a distribution from dirty sources.' && \ + false; } + (cd $(top_srcdir)/ && git archive --prefix=$(dist-version)/ HEAD) > $@ + +$(dist-version).tar: HEAD.tar $(addsuffix /dist-hook,hurd/.. $(subdirs)) + tar -c -f $@ --files-from=/dev/null +# Concatenate HEAD.tar and all subdirs' dist.tar that have been created. Have +# to do it one by one: <http://savannah.gnu.org/patch/?7757>. + for f in HEAD.tar dist.tar */dist.tar; do \ + tar -v --concatenate -f $@ "$$f"; \ + done clean: $(addsuffix -clean,$(subdirs)) clean-misc @@ -97,15 +109,18 @@ install-headers: $(addsuffix -install-headers,$(lib-subdirs) \ TAGS: $(addsuffix -TAGS,$(working-prog-subdirs) $(lib-subdirs)) etags -o $@ $(patsubst %-TAGS,-i %/TAGS,$^) + +%.bz2: % + bzip2 -9 < $< > $@ + +%.gz: % + gzip -9n < $< > $@ ## Targets used by the main targets above. $(prog-subdirs) $(lib-subdirs): FORCE $(MAKE) -C $@ all FORCE: -%-lndist: $(top_srcdir)/hurd-snap - $(MAKE) -C $* lndist no_deps=t - %-clean: $(MAKE) -C $* clean no_deps=t @@ -124,19 +139,13 @@ FORCE: %-TAGS: $(MAKE) -C $* TAGS no_deps=t -$(srcdir)/hurd-snap: - mkdir $(srcdir)/hurd-snap - -lndist: cp-linked-files - -linked-files = install-sh config.guess config.sub mkinstalldirs -lf-inst = $(addprefix $(srcdir)/hurd-snap/,$(linked-files)) -cp-linked-files: $(lf-inst) -$(lf-inst): $(srcdir)/hurd-snap/%: $(srcdir)/% - cp $< $@ +.PHONY: %/dist-hook +%/dist-hook: + $(MAKE) -C $* dist-hook no_deps=t dist-version=$(dist-version) .PHONY: clean-misc distclean clean-misc: + rm -f HEAD.tar distclean: clean rm -f config.make config.log config.status config.cache diff --git a/auth/Makefile b/auth/Makefile index da7f8e23..56b99135 100644 --- a/auth/Makefile +++ b/auth/Makefile @@ -1,4 +1,5 @@ -# Copyright (C) 1991, 93, 94, 95, 96, 2000 Free Software Foundation, Inc. +# Copyright (C) 1991, 93, 94, 95, 96, 2000, 2012 Free Software Foundation, Inc. +# # This file is part of the GNU Hurd. # # The GNU Hurd is free software; you can redistribute it and/or modify @@ -20,11 +21,9 @@ makemode := server SRCS = auth.c OBJS = auth.o authServer.o auth_replyUser.o -LCLHDRS = authmutations.h auth_mig.h target = auth HURDLIBS = threads ports ihash shouldbeinlibc MIGSFLAGS = -imacros $(srcdir)/authmutations.h include ../Makeconf - diff --git a/boot/Makefile b/boot/Makefile index 6c787cfd..b7a835d0 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993,94,95,96,97,2001 Free Software Foundation, Inc. +# Copyright (C) 1993,94,95,96,97,2001,2012 Free Software Foundation, Inc. # This file is part of the GNU Hurd. # # The GNU Hurd is free software; you can redistribute it and/or modify @@ -25,10 +25,8 @@ COMMON-OBJS = notifyServer.o ourdeviceServer.o \ termServer.o bootstrapServer.o boot_script.o userland-boot.o OBJS = boot.o $(COMMON-OBJS) UX-OBJS = mach-crt0.o uxboot.o sigvec.o syscall.o ux.o $(COMMON-OBJS) -LCLHDRS = boot_script.h ux.h target = boot io-MIGSFLAGS=-DREPLY_PORTS -DIST_FILES=frank1.ld frankemul.ld HURDLIBS=store shouldbeinlibc threads include ../Makeconf diff --git a/bsdfsck/Makefile b/bsdfsck/Makefile index b5dcfbf2..4e237e98 100644 --- a/bsdfsck/Makefile +++ b/bsdfsck/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 1994, 1995 Free Software Foundation +# Copyright (C) 1994, 1995, 2012 Free Software Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ SRCS = dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c # preen.c OBJS = dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \ pass5.o setup.o utilities.o tables.o # preen.o -LCLHDRS = fsck.h target = bsdfsck vpath tables.c ../ufs diff --git a/config/Makefile b/config/Makefile index 2cdcd818..00501598 100644 --- a/config/Makefile +++ b/config/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2004, 2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell, p/BSG. # # This file is part of the GNU Hurd. @@ -32,8 +31,6 @@ installed_conf = $(addprefix $(sysconfdir)/,$(SYSCONFFILES)) LOGINDOTS = .bash_login .bashrc .hushlogin .profile README installed_logins = $(addprefix $(sysconfdir)/login/,$(LOGINDOTS)) -DIST_FILES=$(SYSCONFFILES) $(addprefix login-,$(LOGINDOTS)) - FORCE: ifeq ($(override_conf),t) diff --git a/console-client/Makefile b/console-client/Makefile index 995c2d4a..3ec682b3 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -32,10 +32,6 @@ endif SRCS = $(CONSOLE_SRCS) \ $(VGA_SO_SRCS) $(PC_KBD_SO_SRCS) $(PC_MOUSE_SO_SRCS) \ $(GENERIC_SPEAKER_SO_SRCS) $(CURRENT_VCS_SO_SRCS) $(NCURSESW_SO_SRCS) -LCLHDRS = timer.h driver.h display.h input.h bell.h \ - unicode.h bdf.h mach-inputdev.h \ - vga-dynafont.h vga-dynacolor.h vga-hw.h vga-support.h \ - trans.h OBJS = $(SRCS:.c=.o) kdioctlServer.o HURDLIBS = cons threads ports netfs fshelp iohelp ihash shouldbeinlibc diff --git a/console/Makefile b/console/Makefile index 3eb4252e..10737489 100644 --- a/console/Makefile +++ b/console/Makefile @@ -1,4 +1,3 @@ -# # Copyright (C) 2002, 2012 Free Software Foundation, Inc. # Written by Marcus Brinkmann. # @@ -24,8 +23,6 @@ makemode := server target = console SRCS = console.c display.c pager.c input.c -LCLHDRS = display.h pager.h input.h priv.h mutations.h -DIST_FILES = hurd.ti motd.UTF8 MIGSTUBS = notifyServer.o tioctlServer.o fs_notifyUser.o @@ -36,8 +33,6 @@ MIGSFLAGS += -imacros $(srcdir)/mutations.h # This is the old monolithic version of the console server. #SRCS = main.c vcons.c focus.c vga-display.c vga.c dynafont.c bdf.c -#LCLHDRS = focus.h input-drv.h vcons.h display-drv.h vga.h vga-hw.h \ -# dynafont.h bdf.h mutations.h priv.h # #HURDLIBS = trivfs fshelp iohelp threads ports ihash shouldbeinlibc #OBJS = $(subst .c,.o,$(SRCS)) tioctlServer.o diff --git a/doc/Makefile b/doc/Makefile index 449b90eb..735f3a48 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -17,10 +17,11 @@ dir := doc makemode := misc -DIST_FILES := navigating gpl.texinfo hurd.texi version.texi targets = hurd.info $(wildcard hurd.info-*) installationdir = $(infodir) +DISTFILES = $(targets) + DVIPS = dvips include ../Makeconf @@ -52,10 +53,3 @@ stamp-version: $(..)config.make echo '@set VERSION $(hurd-version)' > version.texi.new $(move-if-change) version.texi.new version.texi touch $@ - -# XXX: the default lndist target will try to look for target files -# in the source directory. Special case them. -lndist: lndist-info-targets -lndist-info-targets: hurd.info $(wildcard hurd.info-*) - ln $? $(top_srcdir)/hurd-snap/$(dir) - diff --git a/exec/Makefile b/exec/Makefile index e7050c10..92b4d480 100644 --- a/exec/Makefile +++ b/exec/Makefile @@ -1,4 +1,6 @@ -# Copyright (C) 1993,94,95,96,98,99,2000,01,02,10 Free Software Foundation, Inc. +# Copyright (C) 1993,94,95,96,98,99,2000,01,02,10,12 Free Software Foundation, +# Inc. +# # This file is part of the GNU Hurd. # # The GNU Hurd is free software; you can redistribute it and/or modify @@ -28,10 +30,8 @@ gzip-objects = $(gzip-sources:%.c=%.o) bzip2-sources = do-bunzip2.c bzip2-objects = $(bzip2-sources:%.c=%.o) -LCLHDRS = gzip.h crypt.h tailor.h priv.h execmutations.h target = exec #targets = exec exec.static -DIST_FILES = elfcore.c #OTHERLIBS = -lbfd -liberty HURDLIBS = trivfs fshelp iohelp threads ports ihash shouldbeinlibc diff --git a/ext2fs/Makefile b/ext2fs/Makefile index e83aab26..8e16ebe6 100644 --- a/ext2fs/Makefile +++ b/ext2fs/Makefile @@ -1,6 +1,6 @@ # Makefile for ext2fs # -# Copyright (C) 1994,95,96,99,2000,02 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,99,2000,02,12 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -23,7 +23,6 @@ target = ext2fs SRCS = balloc.c dir.c ext2fs.c getblk.c hyper.c ialloc.c \ inode.c pager.c pokel.c truncate.c storeinfo.c msg.c xinl.c OBJS = $(SRCS:.c=.o) -LCLHDRS = ext2fs.h ext2_fs.h ext2_fs_i.h bitmap.c HURDLIBS = diskfs pager iohelp fshelp store threads ports ihash shouldbeinlibc include ../Makeconf diff --git a/fatfs/Makefile b/fatfs/Makefile index 06ed8778..24dcab12 100644 --- a/fatfs/Makefile +++ b/fatfs/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 2003, 2007 Free Software Foundation +# Copyright (C) 1997, 2003, 2007, 2012 Free Software Foundation # Modified by Marcus Brinkmann, 2000-05-05 # # This program is free software; you can redistribute it and/or @@ -20,7 +20,6 @@ makemode := server target = fatfs SRCS = inode.c main.c dir.c pager.c fat.c virt-inode.c node-create.c -LCLHDRS = fat.h fatfs.h virt-inode.h OBJS = $(SRCS:.c=.o) HURDLIBS = diskfs iohelp fshelp store pager threads ports ihash shouldbeinlibc diff --git a/ftpfs/Makefile b/ftpfs/Makefile index 0b6c9e2b..581c5da6 100644 --- a/ftpfs/Makefile +++ b/ftpfs/Makefile @@ -1,6 +1,6 @@ # Makefile for ftpfs # -# Copyright (C) 1997, 2000 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = ftpfs SRCS = ftpfs.c fs.c host.c netfs.c dir.c conn.c ccache.c node.c ncache.c -LCLHDRS = ftpfs.h ccache.h OBJS = $(SRCS:.c=.o) HURDLIBS = netfs fshelp iohelp threads ports ihash ftpconn shouldbeinlibc diff --git a/hostmux/Makefile b/hostmux/Makefile index 8e100995..b139922f 100644 --- a/hostmux/Makefile +++ b/hostmux/Makefile @@ -1,6 +1,6 @@ # Makefile for hostmux # -# Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999, 2000, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = hostmux SRCS = hostmux.c mux.c leaf.c node.c stubs.c -LCLHDRS = hostmux.h OBJS = $(SRCS:.c=.o) HURDLIBS = netfs fshelp iohelp threads ports ihash shouldbeinlibc diff --git a/hurd/Makefile b/hurd/Makefile index 66a6d287..1cc14fa7 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993,94,95,96,99,2002 Free Software Foundation +# Copyright (C) 1993,94,95,96,99,2002,2012 Free Software Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -18,7 +18,6 @@ dir := hurd makemode := misc hdrs = $(wildcard $(srcdir)/*.defs $(srcdir)/*.h) -DIST_FILES = subsystems $(notdir $(hdrs)) ioctl-tmpl.sym ioctl.awk gensym.awk INSTHDRS = hurd_types.h version.h ioctl_types.h paths.h shared.h console.h \ $(notdir $(wildcard $(srcdir)/*.defs)) diff --git a/include/Makefile b/include/Makefile index 3dc9ba75..b8773fe1 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,6 +1,6 @@ # Makefile for include subdirectory. # -# Copyright (C) 1996, 2002, 2010 Free Software Foundation, Inc. +# Copyright (C) 1996, 2002, 2010, 2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell, p/BSG. # # This file is part of the GNU Hurd. @@ -24,14 +24,9 @@ makemode := misc installhdrs := sys/procfs.h -LCLHDRS := $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.h $(srcdir)/*/*.h)) - include ../Makeconf install-headers install: $(installhdrs:%=$(includedir)/%) $(includedir)/%: $(srcdir)/% @$(MKINSTALLDIRS) $(@D) $(INSTALL_DATA) $< $@ - -lndist: $(top_srcdir)/hurd-snap/$(dir) - cp -r --parent $(addprefix $(srcdir)/, Makefile $(installhdrs)) $< diff --git a/isofs/Makefile b/isofs/Makefile index 515611c5..4f788368 100644 --- a/isofs/Makefile +++ b/isofs/Makefile @@ -1,5 +1,4 @@ - -# Copyright (C) 1997, 2000, 2005 Free Software Foundation +# Copyright (C) 1997, 2000, 2005, 2012 Free Software Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -20,8 +19,6 @@ makemode := server target = iso9660fs SRCS = inode.c main.c lookup.c pager.c rr.c -LCLHDRS = iso9660.h isofs.h rr.h -DIST_FILES = EXTENSIONS OBJS = $(SRCS:.c=.o) HURDLIBS = diskfs iohelp fshelp store pager threads ports ihash shouldbeinlibc diff --git a/libcons/Makefile b/libcons/Makefile index 38ca74a7..e0bf62c4 100644 --- a/libcons/Makefile +++ b/libcons/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 1994,95,96,97,98,99,2000,01,02,2005,2010 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,97,98,99,2000,01,02,2005,2010,2012 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -24,7 +24,6 @@ SRCS= demuxer.c init-init.c init-loop.c opts-version.c extra-version.c \ cons-switch.c vcons-remove.c vcons-add.c vcons-open.c \ vcons-close.c vcons-destroy.c vcons-refresh.c vcons-scrollback.c \ vcons-input.c vcons-move-mouse.c vcons-event.c -LCLHDRS = priv.h mutations.h $(installhdrs) installhdrs = cons.h fs_notify-MIGSFLAGS = -imacros $(srcdir)/mutations.h diff --git a/libdirmgt/Makefile b/libdirmgt/Makefile index 438061c6..f4e9f758 100644 --- a/libdirmgt/Makefile +++ b/libdirmgt/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995 Free Software Foundation +# Copyright (C) 1995, 2012 Free Software Foundation # Written by Michael I. Bushnell. # # This file is part of the GNU Hurd. @@ -21,6 +20,4 @@ dir := libdirmgt makemode := misc -LCLHDRS = dirmgt.h - include ../Makeconf diff --git a/libdiskfs/Makefile b/libdiskfs/Makefile index 73686889..606ed954 100644 --- a/libdiskfs/Makefile +++ b/libdiskfs/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994,95,96,97,98,99,2000,01,2006 +# Copyright (C) 1994,95,96,97,98,99,2000,01,2006,2012 # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or @@ -54,7 +53,6 @@ OTHERSRCS = conch-fetch.c conch-set.c dir-clear.c dir-init.c dir-renamed.c \ validate-mode.c validate-group.c validate-author.c validate-flags.c \ validate-rdev.c validate-owner.c extra-version.c SRCS = $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(IFSOCKSRCS) -LCLHDRS = diskfs.h priv.h lithp.h fsmutations.h diskfs-pager.h fhandle.h installhdrs = diskfs.h diskfs-pager.h MIGSTUBS = fsServer.o ioServer.o fsysServer.o exec_startupServer.o \ diff --git a/libfshelp/Makefile b/libfshelp/Makefile index 30879dc9..bbc079c7 100644 --- a/libfshelp/Makefile +++ b/libfshelp/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 1994, 95, 96, 98, 1999, 2006 Free Software Foundation, Inc. +# Copyright (C) 1994, 95, 96, 98, 1999, 2006, 2012 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -30,7 +30,6 @@ SRCS = lock-acquire.c lock-init.c \ perms-isowner.c perms-iscontroller.c perms-access.c \ perms-checkdirmod.c \ touch.c -LCLHDRS = fshelp.h locks.h trans.h installhdrs = fshelp.h HURDLIBS = shouldbeinlibc threads iohelp ports diff --git a/libftpconn/Makefile b/libftpconn/Makefile index 05f3ddfb..02b72f50 100644 --- a/libftpconn/Makefile +++ b/libftpconn/Makefile @@ -1,6 +1,6 @@ # Makefile for libftpconn # -# Copyright (C) 1997 Free Software Foundation, Inc. +# Copyright (C) 1997, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -25,7 +25,6 @@ installhdrsubdir = . SRCS = addr.c cmd.c create.c cwd.c errs.c names.c open.c reply.c \ rmt.c set-type.c stats.c unix.c xfer.c xinl.c fname.c -LCLHDRS = ftpconn.h priv.h OBJS = $(SRCS:.c=.o) diff --git a/libihash/Makefile b/libihash/Makefile index e0258241..09bb1362 100644 --- a/libihash/Makefile +++ b/libihash/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995, 1996, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 2001, 2003, 2012 Free Software Foundation, Inc. # # This file is part of the GNU Hurd. # @@ -23,7 +22,6 @@ makemode := library libname := libihash SRCS = ihash.c installhdrs = ihash.h -LCLHDRS = $(installhdrs) OBJS = $(SRCS:.c=.o) diff --git a/libiohelp/Makefile b/libiohelp/Makefile index ba73282b..56815c49 100644 --- a/libiohelp/Makefile +++ b/libiohelp/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993, 1994, 1995, 1996, 1998, 2002, 2008 Free Software +# Copyright (C) 1993, 1994, 1995, 1996, 1998, 2002, 2008, 2012 Free Software # Foundation, Inc. # # This program is free software; you can redistribute it and/or @@ -23,7 +23,6 @@ SRCS = get_conch.c handle_io_get_conch.c handle_io_release_conch.c \ iouser-dup.c iouser-reauth.c iouser-free.c iouser-restrict.c \ shared.c return-buffer.c OBJS = $(SRCS:.c=.o) -LCLHDRS = iohelp.h HURDLIBS = threads shouldbeinlibc libname = libiohelp installhdrs = iohelp.h diff --git a/libnetfs/Makefile b/libnetfs/Makefile index d6a991df..33ee2fb2 100644 --- a/libnetfs/Makefile +++ b/libnetfs/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2008 Free Software +# Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2008, 2012 Free Software # Foundation # # Written by Michael I. Bushnell. @@ -56,7 +55,6 @@ OTHERSRCS= drop-node.c init-init.c make-node.c make-peropen.c make-protid.c \ SRCS= $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(IFSOCKSRCS) -LCLHDRS = netfs.h callbacks.h misc.h modes.h mutations.h priv.h execserver.h installhdrs=netfs.h MIGSTUBS= ioServer.o fsServer.o fsysServer.o fsys_replyUser.o ifsockServer.o diff --git a/libpager/Makefile b/libpager/Makefile index fc23364a..40eed16f 100644 --- a/libpager/Makefile +++ b/libpager/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994, 1995, 1996 Free Software Foundation +# Copyright (C) 1994, 1995, 1996, 2012 Free Software Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -26,7 +25,6 @@ SRCS = data-request.c data-return.c data-unlock.c pager-port.c \ stubs.c seqnos.c demuxer.c chg-compl.c pager-attr.c clean.c \ dropweak.c notify-stubs.c get-upi.c pager-memcpy.c pager-return.c \ offer-page.c -LCLHDRS = pager.h priv.h installhdrs = pager.h HURDLIBS= threads ports diff --git a/libpipe/Makefile b/libpipe/Makefile index b64166a6..a7625d6c 100644 --- a/libpipe/Makefile +++ b/libpipe/Makefile @@ -1,6 +1,6 @@ # Makefile for libpipe # -# Copyright (C) 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -23,7 +23,6 @@ libname = libpipe installhdrs = pipe.h pq.h SRCS = pq.c dgram.c pipe.c stream.c seqpack.c addr.c pq-funcs.c pipe-funcs.c -LCLHDRS = pipe.h pq.h OBJS = $(SRCS:.c=.o) HURDLIBS=threads ports diff --git a/libports/Makefile b/libports/Makefile index 50b5ed9e..8d7d9bbb 100644 --- a/libports/Makefile +++ b/libports/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995,96,97,99,2000 Free Software Foundation, Inc. +# Copyright (C) 1995,96,97,99,2000,2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell. # # This file is part of the GNU Hurd. @@ -39,7 +38,6 @@ SRCS = create-bucket.c create-class.c \ claim-right.c transfer-right.c create-port-noinstall.c create-internal.c \ interrupted.c -LCLHDRS = ports.h installhdrs = ports.h HURDLIBS= ihash diff --git a/libps/Makefile b/libps/Makefile index ec35c852..d3c0b187 100644 --- a/libps/Makefile +++ b/libps/Makefile @@ -1,6 +1,6 @@ # Makefile for libps # -# Copyright (C) 1995,96,99,2002 Free Software Foundation, Inc. +# Copyright (C) 1995,96,99,2002,2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell. # # This file is part of the GNU Hurd. @@ -25,7 +25,6 @@ makemode := library libname = libps SRCS = context.c filters.c fmt.c host.c proclist.c procstat.c spec.c \ tty.c user.c write.c -LCLHDRS=ps.h common.h installhdrs = ps.h installhdrsubdir = . diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile index 0787d2d6..31a940ff 100644 --- a/libshouldbeinlibc/Makefile +++ b/libshouldbeinlibc/Makefile @@ -1,6 +1,6 @@ # Makefile for libshouldbeinlibc # -# Copyright (C) 1995,96,97,98,99,2002 Free Software Foundation, Inc. +# Copyright (C) 1995,96,97,98,99,2002,2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -30,7 +30,6 @@ SRCS = termsize.c timefmt.c exec-reauth.c maptime-funcs.c \ ugids-verify-auth.c installhdrs = idvec.h timefmt.h maptime.h \ wire.h portinfo.h portxlate.h cacheq.h ugids.h -LCLHDRS = $(installhdrs) installhdrsubdir = . OBJS = $(SRCS:.c=.o) diff --git a/libstore/Makefile b/libstore/Makefile index 2fb3c70d..9381b95c 100644 --- a/libstore/Makefile +++ b/libstore/Makefile @@ -50,14 +50,12 @@ store-types = \ zero libstore.so-LDLIBS += $(PARTED_LIBS) -ldl -LCLHDRS=store.h installhdrs=store.h HURDLIBS = shouldbeinlibc GUNZIP_OBJS = unzip.o inflate.o util.o BUNZIP2_OBJS = do-bunzip2.o OBJS = $(SRCS:.c=.o) $(GUNZIP_OBJS) $(BUNZIP2_OBJS) -DIST_FILES = unzipstore.c include ../Makeconf diff --git a/libthreads/Makefile b/libthreads/Makefile index e9fa571b..3bcff2aa 100644 --- a/libthreads/Makefile +++ b/libthreads/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994,95,96,97,2000,2010 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,97,2000,2010,2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -25,7 +24,6 @@ SRCS := call.c cprocs.c cthread_data.c cthreads.c stack.c \ I386SRCS := i386/csw.S i386/thread.c # In GNU machine/cthreads.h is omitted; that work is done in libc headers. -LCLHDRS := cthread_internals.h options.h cthreads.h rwlock.h OBJS = $(addsuffix .o,$(basename $(notdir $(SRCS) $(I386SRCS)))) @@ -43,23 +41,8 @@ include ../Makeconf # what that means, you'll understand this line. CFLAGS := $(filter-out -Wall,$(CFLAGS)) -lndist: lndist-i386-files - -lndist-i386-files: $(top_srcdir)/hurd-snap/$(dir)/i386 - ln $(addprefix $(srcdir)/,$(I386SRCS) $(I386HDRS)) $< - -$(top_srcdir)/hurd-snap/$(dir)/i386: - mkdir $@ - ifeq ($(VERSIONING),yes) - # Adding this dependency gets it included in the command line, # where ld will read it as a linker script. $(libname).so.$(hurd-version): $(srcdir)/$(libname).map - -lndist: lndist-map-file - -lndist-map-file: $(top_srcdir)/hurd-snap/$(dir) - ln $(addprefix $(srcdir)/,$(libname).map) $< - endif diff --git a/libtreefs/Makefile b/libtreefs/Makefile index 3cdc30c9..faec2025 100644 --- a/libtreefs/Makefile +++ b/libtreefs/Makefile @@ -1,6 +1,6 @@ # Makefile for libtreefs # -# Copyright (C) 1995 Free Software Foundation, Inc. +# Copyright (C) 1995, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -27,7 +27,6 @@ OTHERSRCS = defhooks.c dir-hooks.c dir-lookup.c fsys-getroot.c fsys-hooks.c \ fsys-startup.c hooks.c mdir.c nlist.c node-hooks.c rights.c \ trans-help.c trans-start.c xinl.c SRCS = $(OTHERSRCS) $(S_SRCS) -LCLHDRS = treefs.h fs-mutate.h MIGSTUBS = fsServer.o ioServer.o fsysServer.o OBJS = $(sort $(SRCS:.c=.o)) $(MIGSTUBS) diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile index ddce1e61..1c6fd5ee 100644 --- a/libtrivfs/Makefile +++ b/libtrivfs/Makefile @@ -1,6 +1,5 @@ -# -# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2008 Free -# Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2008, 2012 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -49,7 +48,6 @@ MIGSTUBS=fsServer.o ioServer.o fsysServer.o fsys_replyUser.o libname = libtrivfs HURDLIBS = fshelp iohelp ports shouldbeinlibc OBJS= $(sort $(subst .c,.o,$(SRCS)) $(MIGSTUBS)) -LCLHDRS = trivfs.h fsmutations.h priv.h MIGSFLAGS=-imacros $(srcdir)/fsmutations.h MIGCOMSFLAGS = -prefix trivfs_ installhdrs := trivfs.h diff --git a/mach-defpager/Makefile b/mach-defpager/Makefile index 9a4b7edf..b16aa80d 100644 --- a/mach-defpager/Makefile +++ b/mach-defpager/Makefile @@ -1,6 +1,7 @@ # Makefile for mach-defpager subdirectory of hurd sources # -# Copyright (C) 1999, 2000, 2002, 2007, 2010 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2002, 2007, 2010, 2012 Free Software Foundation, +# Inc. # # This file is part of the GNU Hurd. # @@ -27,7 +28,6 @@ OBJS := $(SRCS:.c=.o) \ $(addsuffix Server.o,\ memory_object default_pager memory_object_default exc) \ default_pager_replyUser.o -LCLHDRS := file_io.h queue.h wiring.h kalloc.h default_pager.h HURDLIBS:= threads LDFLAGS += -static diff --git a/nfs/Makefile b/nfs/Makefile index 10ca2587..86b10899 100644 --- a/nfs/Makefile +++ b/nfs/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995, 1996, 1997, 2000, 2001, 2008, 2011 Free Software +# Copyright (C) 1995, 1996, 1997, 2000, 2001, 2008, 2011, 2012 Free Software # Foundation, Inc. # # Written by Michael I. Bushnell. @@ -24,7 +23,6 @@ dir := nfs makemode := server target = nfs -LCLHDRS = nfs.h mount.h nfs-spec.h SRCS = ops.c rpc.c mount.c nfs.c cache.c consts.c main.c name-cache.c \ storage-info.c OBJS = $(SRCS:.c=.o) diff --git a/nfsd/Makefile b/nfsd/Makefile index 2c05b7ed..5487a946 100644 --- a/nfsd/Makefile +++ b/nfsd/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1996 Free Software Foundation, Inc. +# Copyright (C) 1996, 2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell, p/BSG. # # This file is part of the GNU Hurd. @@ -23,7 +22,6 @@ makemode := utility SRCS = cache.c loop.c main.c ops.c fsys.c xdr.c OBJS = $(subst .c,.o,$(SRCS)) -LCLHDRS = nfsd.h target = nfsd installationdir = $(sbindir) HURDLIBS=threads shouldbeinlibc 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 $@ diff --git a/pflocal/Makefile b/pflocal/Makefile index 7258e587..78b4c3f9 100644 --- a/pflocal/Makefile +++ b/pflocal/Makefile @@ -1,6 +1,6 @@ # Makefile for pflocal # -# Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 2000, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = pflocal SRCS = connq.c io.c pflocal.c socket.c pf.c sock.c sserver.c -LCLHDRS = connq.h sock.h mig-decls.h mig-mutate.h sserver.h MIGSTUBS = ioServer.o socketServer.o OBJS = $(SRCS:.c=.o) $(MIGSTUBS) diff --git a/proc/Makefile b/proc/Makefile index a1159700..d54166d2 100644 --- a/proc/Makefile +++ b/proc/Makefile @@ -1,4 +1,6 @@ -# Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2012 Free Software Foundation, +# Inc. +# # This file is part of the GNU Hurd. # # The GNU Hurd is free software; you can redistribute it and/or modify @@ -21,8 +23,6 @@ makemode := server target = proc SRCS = wait.c hash.c host.c info.c main.c mgt.c notify.c pgrp.c msg.c \ cpu-types.c stubs.c -LCLHDRS = proc.h -DIST_FILES = proc_exc.defs ourmsg.defs MIGSFLAGS="-DPROCESS_INTRAN=pstruct_t reqport_find (process_t)" \ "-DPROCESS_DESTRUCTOR=process_drop (pstruct_t)" \ diff --git a/release/Makefile b/release/Makefile index e5d94e18..a11a7df1 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,5 +1,5 @@ # Makefile for Hurd release tools -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell, p/BSG. # # This file is part of the GNU Hurd. @@ -21,18 +21,6 @@ dir := release makemode := misc -# Files that go into the root of binary distributions -dist-files = INSTALL-binary dist-README SETUP servers.boot bfloppy.boot \ - menu.lst COPYING.LIB SOURCES.0.2 - -# Files describing the contents of boot floppies -floppy-copy = bfloppy.copy bfloppy-special.copy rfloppy.copy rfloppy-special.copy \ - bfloppy1.copy bfloppy1-special.copy bfloppy2.copy bfloppy2-special.copy - -scripts = mkfsimage.sh mksmallso.sh mkemptyso.sh - -DIST_FILES = README $(dist-files) $(floppy-copy) $(scripts) - include ../Makeconf ifneq ($(dist-root),) diff --git a/storeio/Makefile b/storeio/Makefile index f027ebd4..0190be07 100644 --- a/storeio/Makefile +++ b/storeio/Makefile @@ -1,6 +1,6 @@ # Makefile for storeio # -# Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 2000, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -21,7 +21,6 @@ makemode := server target = storeio SRCS = dev.c storeio.c open.c pager.c io.c -LCLHDRS = dev.h open.h OBJS = $(SRCS:.c=.o) HURDLIBS = trivfs pager fshelp iohelp store threads ports ihash shouldbeinlibc diff --git a/sutils/Makefile b/sutils/Makefile index b2383579..773a7dab 100644 --- a/sutils/Makefile +++ b/sutils/Makefile @@ -1,6 +1,6 @@ # Makefile for sutils # -# Copyright (C) 1996,97,99,2000,2010 Free Software Foundation, Inc. +# Copyright (C) 1996,97,99,2000,2010,2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ targets = $(special-targets) $(progs) special-targets = $(scripts) installationdir = $(sbindir) SRCS = $(progs:=.c) clookup.c fstab.c update.c $(scripts:=.sh) -LCLHDRS = fstab.h OBJS = $(progs:=.c) HURDLIBS = store shouldbeinlibc diff --git a/term/Makefile b/term/Makefile index e13763a1..4aa6e3df 100644 --- a/term/Makefile +++ b/term/Makefile @@ -1,5 +1,6 @@ +# Copyright (C) 1995,96,97,99, 2000, 2002, 2012 Free Software Foundation, +# Inc. # -# Copyright (C) 1995,96,97,99, 2000, 2002 Free Software Foundation, Inc. # Written by Michael I. Bushnell, p/BSG. # # This file is part of the GNU Hurd. @@ -23,8 +24,6 @@ makemode := server target = term SRCS = devio.c munge.c users.c main.c ptyio.c hurdio.c xinl.c -LCLHDRS = term.h -DIST_FILES = ourmsg.defs HURDLIBS = trivfs fshelp iohelp threads ports ihash shouldbeinlibc OBJS = $(subst .c,.o,$(SRCS)) termServer.o device_replyServer.o tioctlServer.o ourmsgUser.o diff --git a/tmpfs/Makefile b/tmpfs/Makefile index 18293771..7730949c 100644 --- a/tmpfs/Makefile +++ b/tmpfs/Makefile @@ -1,6 +1,6 @@ # Makefile for tmpfs # -# Copyright (C) 2000,01,02 Free Software Foundation, Inc. +# Copyright (C) 2000,01,02,12 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = tmpfs SRCS = tmpfs.c node.c dir.c pager-stubs.c OBJS = $(SRCS:.c=.o) default_pagerUser.o -LCLHDRS = tmpfs.h # XXX The shared libdiskfs requires libstore even though we don't use it here. HURDLIBS = diskfs pager iohelp fshelp store threads ports ihash shouldbeinlibc diff --git a/ufs-fsck/Makefile b/ufs-fsck/Makefile index a484428e..03ce9cc7 100644 --- a/ufs-fsck/Makefile +++ b/ufs-fsck/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994, 1995, 1996 Free Software Foundation +# Copyright (C) 1994, 1995, 1996, 2012 Free Software Foundation # Written by Michael I. Bushnell. # # This file is part of the GNU Hurd. @@ -24,7 +23,6 @@ makemode := utility SRCS = dir.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c inode.c OBJS = $(subst .c,.o,$(SRCS)) tables.o -LCLHDRS = fsck.h target = fsck.ufs installationdir = $(sbindir) HURDLIBS=shouldbeinlibc diff --git a/ufs/Makefile b/ufs/Makefile index cf5c40d7..a1cfc4c9 100644 --- a/ufs/Makefile +++ b/ufs/Makefile @@ -1,6 +1,6 @@ # Makefile for ufs # -# Copyright (C) 1994,95,96,99,2000,02 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,99,2000,02,12 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = ufs SRCS = alloc.c consts.c dir.c hyper.c inode.c main.c pager.c \ sizes.c subr.c tables.c bmap.c pokeloc.c xinl.c -LCLHDRS = ufs.h fs.h dinode.h dir.h OBJS = $(SRCS:.c=.o) HURDLIBS = diskfs iohelp fshelp store pager threads ports ihash shouldbeinlibc diff --git a/usermux/Makefile b/usermux/Makefile index c07ae927..6e06b159 100644 --- a/usermux/Makefile +++ b/usermux/Makefile @@ -1,6 +1,6 @@ # Makefile for usermux # -# Copyright (C) 1997, 2000 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = usermux SRCS = usermux.c mux.c leaf.c node.c stubs.c -LCLHDRS = usermux.h OBJS = $(SRCS:.c=.o) HURDLIBS = netfs fshelp iohelp threads ports ihash shouldbeinlibc diff --git a/utils/Makefile b/utils/Makefile index 3f3307f4..3bb8b17c 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 1994,95,96,97,98,99,2000,01,02 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,97,98,99,2000,01,02,12 Free Software Foundation, +# Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -29,7 +29,6 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \ parse.c frobauth.c frobauth-mod.c setauth.c pids.c nonsugid.c \ unsu.c ftpcp.c ftpdir.c storeread.c storecat.c msgport.c \ rpctrace.c mount.c gcore.c fakeauth.c fakeroot.sh -LCLHDRS = psout.h parse.h pids.h frobauth.h OBJS = $(filter-out %.sh,$(SRCS:.c=.o)) HURDLIBS = ps ihash store fshelp threads ports ftpconn shouldbeinlibc |