Skip to content
This repository has been archived by the owner on Feb 5, 2022. It is now read-only.

Commit

Permalink
Remove distribute variable from Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
drepper committed Mar 7, 2012
1 parent 482ff4d commit a4300c7
Show file tree
Hide file tree
Showing 53 changed files with 107 additions and 378 deletions.
45 changes: 45 additions & 0 deletions ChangeLog
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,50 @@
2012-03-07 Ulrich Drepper <drepper@gmail.com> 2012-03-07 Ulrich Drepper <drepper@gmail.com>


* login/Makefile (distribute): Remove variable.
* catgets/Makefile: Likewise.
* mach/Makefile: Likewise.
* malloc/Makefile: Likewise.
* misc/Makefile: Likewise.
* iconv/Makefile: Likewise.
* nscd/Makefile: Likewise.
* hurd/Makefile: Likewise.
* manual/Makefile: Likewise.
* locale/Makefile: Likewise.
* intl/Makefile: Likewise.
* conform/Makefile: Likewise.
* nss/Makefile: Likewise.
* time/Makefile: Likewise.
* soft-fp/Makefile: Likewise.
* dirent/Makefile: Likewise.
* gmon/Makefile: Likewise.
* po/Makefile: Likewise.
* rt/Makefile: Likewise.
* socket/Makefile: Likewise.
* math/Makefile: Likewise.
* signal/Makefile: Likewise.
* debug/Makefile: Likewise.
* elf/Makefile: Likewise.
* timezone/Makefile: Likewise.
* stdlib/Makefile: Likewise.
* iconvdata/Makefile: Likewise.
* sunrpc/Makefile: Likewise.
* io/Makefile: Likewise.
* argp/Makefile: Likewise.
* inet/Makefile: Likewise.
* hesiod/Makefile: Likewise.
* grp/Makefile: Likewise.
* csu/Makefile: Likewise.
* wctype/Makefile: Likewise.
* crypt/Makefile: Likewise.
* libio/Makefile: Likewise.
* string/Makefile: Likewise.
* nis/Makefile: Likewise.
* resolv/Makefile: Likewise.
* stdio-common/Makefile: Likewise.
* wcsmbs/Makefile: Likewise.
* dlfcn/Makefile: Likewise.
* posix/Makefile: Likewise.

* timezone/Makefile: Don't install timezone files, just the programs * timezone/Makefile: Don't install timezone files, just the programs
and scripts. and scripts.


Expand Down
4 changes: 2 additions & 2 deletions argp/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (C) 1997,2002,2003,2006,2007,2010 Free Software Foundation, Inc. # Copyright (C) 1997,2002,2003,2006,2007,2010,2012
# Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -21,7 +22,6 @@
subdir := argp subdir := argp


headers = argp.h headers = argp.h
distribute = argp-fmtstream.h argp-namefrob.h
routines = $(addprefix argp-, ba fmtstream fs-xinl help parse pv \ routines = $(addprefix argp-, ba fmtstream fs-xinl help parse pv \
pvh xinl eexst) pvh xinl eexst)


Expand Down
4 changes: 1 addition & 3 deletions catgets/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 1996-2000, 2002, 2003, 2004 Free Software Foundation, Inc. # Copyright (C) 1996-2000, 2002-2004, 2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -21,8 +21,6 @@
subdir := catgets subdir := catgets


headers = nl_types.h headers = nl_types.h
distribute = catgetsinfo.h config.h xopen-msg.sed test1.msg test2.msg \
test-gencat.sh sample.SJIS
routines = catgets open_catalog routines = catgets open_catalog
others = gencat others = gencat
install-bin = gencat install-bin = gencat
Expand Down
3 changes: 0 additions & 3 deletions conform/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
# #
subdir := conform subdir := conform


distribute = conformtest.pl $(wildcard data/*.h-data) \
$(wildcard data/*/*.h-data)

include ../Rules include ../Rules


ifneq (yes,$(fast-check)) ifneq (yes,$(fast-check))
Expand Down
5 changes: 1 addition & 4 deletions crypt/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 1996, 2000, 2001, 2007, 2009 Free Software Foundation, Inc. # Copyright (C) 1996,2000,2001,2007,2009,2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -30,9 +30,6 @@ libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \


tests := cert md5c-test sha256c-test sha512c-test tests := cert md5c-test sha256c-test sha512c-test


distribute := ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \
Banner md5.h sha256.h sha512.h

include ../Makeconfig include ../Makeconfig


ifeq ($(crypt-in-libc),yes) ifeq ($(crypt-in-libc),yes)
Expand Down
2 changes: 0 additions & 2 deletions csu/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
b$(start-installed-name) $(csu-dummies) \ b$(start-installed-name) $(csu-dummies) \
S$(start-installed-name)) S$(start-installed-name))
install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies) install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
distribute = gmon-start.c start.c \
abi-note.S init.c c not-cancel.h
generated = version-info.h generated = version-info.h
before-compile = $(objpfx)version-info.h before-compile = $(objpfx)version-info.h


Expand Down
2 changes: 0 additions & 2 deletions debug/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
subdir := debug subdir := debug


headers := execinfo.h headers := execinfo.h
distribute = sigcontextinfo.h register-dump.h frame.h


routines = backtrace backtracesyms backtracesymsfd noophooks \ routines = backtrace backtracesyms backtracesymsfd noophooks \
memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \ memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
Expand Down Expand Up @@ -138,7 +137,6 @@ install-bin-script = xtrace


include ../Makeconfig include ../Makeconfig


distribute += catchsegv.sh xtrace.sh
ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
install-bin-script += catchsegv install-bin-script += catchsegv
endif endif
Expand Down
4 changes: 2 additions & 2 deletions dirent/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (C) 1991-2000,2002,2003,2005,2006,2011 Free Software Foundation, Inc. # Copyright (C) 1991-2000,2002,2003,2005,2006,2011,2012
# Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -26,7 +27,6 @@ routines := opendir closedir readdir readdir_r rewinddir \
getdents getdents64 dirfd readdir64 readdir64_r scandir64 \ getdents getdents64 dirfd readdir64 readdir64_r scandir64 \
alphasort64 versionsort64 fdopendir \ alphasort64 versionsort64 fdopendir \
scandirat scandirat64 scandirat scandirat64
distribute := dirstream.h


tests := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \ tests := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \
tst-fdopendir2 tst-fdopendir2
Expand Down
6 changes: 0 additions & 6 deletions dlfcn/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 dlinfo \
dlmopen dlfcn dlmopen dlfcn
routines := $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines))) routines := $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))
elide-routines.os := $(routines) elide-routines.os := $(routines)
distribute := dlopenold.c glreflib1.c glreflib2.c glreflib3.c \
failtestmod.c \
defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \
modcxaatexit.c modstatic.c modstatic2.c \
bug-dlsym1-lib1.c bug-dlsym1-lib2.c bug-atexit1-lib.c \
bug-atexit2-lib.c


extra-libs-others := libdl extra-libs-others := libdl


Expand Down
85 changes: 0 additions & 85 deletions elf/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -41,91 +41,6 @@ shared-only-routines += dl-caller
rtld-routines := rtld $(dl-routines) dl-sysdep dl-environ dl-minimal rtld-routines := rtld $(dl-routines) dl-sysdep dl-environ dl-minimal
all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)


distribute := rtld-Rules \
$(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
dl-cache.h dl-hash.h soinit.c sofini.c ldd.bash.in \
genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h \
dl-librecon.h interp.c sln.c dl-dst.h hp-timing.h \
dl-lookupcfg.h sprof.c gen-trusted-dirs.awk \
testobj1.c testobj2.c testobj3.c testobj4.c testobj5.c \
testobj6.c testobj1_1.c failobj.c unloadmod.c \
ldconfig.h ldconfig.c cache.c readlib.c readelflib.c \
chroot_canon.c gccframe.h \
dep1.c dep2.c dep3.c dep4.c dl-dtprocnum.h unsecvars.h \
vismain.c vismod1.c vismod2.c vismod3.c \
constload2.c constload3.c filtmod1.c filtmod2.c \
nodlopenmod.c nodelete.c nodelmod1.c nodelmod2.c \
nodelmod3.c nodelmod4.c nodlopen.c dl-osinfo.h \
reldepmod1.c reldepmod2.c reldepmod3.c reldepmod4.c \
reldepmod5.c reldepmod6.c \
reldep4mod1.c reldep4mod2.c reldep4mod3.c reldep4mod4.c \
nextmod1.c nextmod2.c pathoptobj.c tst-pathopt.sh \
neededobj1.c neededobj2.c neededobj3.c neededobj4.c \
neededobj5.c neededobj6.c firstobj.c \
unload2mod.c unload2dep.c ltglobmod1.c ltglobmod2.c \
testobj.h vismod.h globalmod1.c \
dblloadmod1.c dblloadmod2.c dblloadmod3.c \
reldep6mod4.c reldep6mod3.c reldep6mod2.c reldep6mod1.c \
reldep6mod0.c reldep7mod1.c reldep7mod2.c \
unwind-dw2.c unwind-dw2-fde.c unwind.h unwind-pe.h \
unwind-dw2-fde.h dwarf2.h dl-procinfo.c tls.h dl-tls.h \
tst-tlsmod1.c tst-tlsmod2.c tst-tlsmod3.c tst-tlsmod4.c \
tst-tlsmod5.c tst-tlsmod6.c tst-tlsmod7.c tst-tlsmod8.c \
tst-tlsmod9.c tst-tlsmod10.c tst-tlsmod11.c \
tst-tlsmod12.c tst-tls10.h tst-alignmod.c tst-alignmod2.c \
circlemod1.c circlemod1a.c circlemod2.c circlemod2a.c \
circlemod3.c circlemod3a.c nodlopenmod2.c \
tst-tls19mod1.c tst-tls19mod2.c tst-tls19mod3.c \
tls-macros.h \
reldep8mod1.c reldep8mod2.c reldep8mod3.c \
nodel2mod1.c nodel2mod2.c nodel2mod3.c \
reldep9.c reldep9mod1.c reldep9mod2.c reldep9mod3.c \
tst-array1.exp tst-array2.exp tst-array4.exp \
tst-array2dep.c tst-piemod1.c \
tst-execstack-mod.c tst-dlmodcount.c \
check-textrel.c dl-sysdep.h test-dlopenrpathmod.c \
tst-deep1mod1.c tst-deep1mod2.c tst-deep1mod3.c \
unload3mod1.c unload3mod2.c unload3mod3.c unload3mod4.c \
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
unload6mod1.c unload6mod2.c unload6mod3.c \
unload7mod1.c unload7mod2.c \
unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
tst-auditmod4a.c tst-auditmod4b.c \
tst-audit5.c tst-auditmod5a.c tst-auditmod5b.c \
tst-audit6.c tst-auditmod6a.c tst-auditmod6b.c \
tst-auditmod6c.c \
tst-audit7.c tst-auditmod7a.c tst-auditmod7b.c \
order2mod1.c order2mod2.c order2mod3.c order2mod4.c \
tst-stackguard1.c tst-stackguard1-static.c \
tst-array5.c tst-array5-static.c tst-array5dep.c \
tst-array5.exp tst-leaks1.c check-execstack.c \
ifuncmain1.c ifuncmain1pic.c ifuncmain1vis.c \
ifuncmain1vispic.c ifuncmain1static.c \
ifuncmain1staticpic.c ifuncmain1picstatic.c \
ifuncdep1.c ifuncdep1pic.c ifuncmod1.c \
ifuncmain1pie.c ifuncmain1vispie.c \
ifuncmain1staticpie.c \
ifuncmain2.c ifuncmain2static.c ifuncdep2.c \
ifuncmain2pic.c ifuncmain2picstatic.c ifuncdep2pic.c \
ifuncmain3.c ifuncmod3.c \
ifuncmain4.c ifuncmain4static.c ifuncmain4picstatic.c \
ifuncmain5.c ifuncmain5pic.c ifuncmain5picstatic.c \
ifuncmain5pie.c ifuncmain5static.c \
ifuncmain5staticpic.c \
ifuncdep5.c ifuncdep5pic.c ifuncmod5.c \
ifuncmain6pie.c ifuncmod6.c \
ifuncmain7.c ifuncmain7pic.c ifuncmain7picstatic.c \
ifuncmain7pie.c ifuncmain7static.c \
tst-unique1.c tst-unique1mod1.c tst-unique1mod2.c \
tst-unique2.c tst-unique2mod1.c tst-unique2mod2.c \
tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
tst-initorder.c \
tst-initorder2.c \
tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c

CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-dl-iterate-phdr.c = $(uses-callbacks) CFLAGS-dl-iterate-phdr.c = $(uses-callbacks)
Expand Down
3 changes: 1 addition & 2 deletions gmon/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 1995,1996,1997,2001,2002,2005 Free Software Foundation, Inc. # Copyright (C) 1995-1997,2001,2002,2005,2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -21,7 +21,6 @@
subdir := gmon subdir := gmon


headers := sys/gmon.h sys/gmon_out.h sys/profil.h headers := sys/gmon.h sys/gmon_out.h sys/profil.h
distribute := machine-gmon.h profil-counter.h
routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq routines := gmon mcount profil sprofil bb_init_func bb_exit_func prof-freq


elide-routines.os = bb_init_func bb_exit_func elide-routines.os = bb_init_func bb_exit_func
Expand Down
5 changes: 2 additions & 3 deletions grp/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (C) 1991,1992,1996-2000,2003,2004 Free Software Foundation, Inc. # Copyright (C) 1991,1992,1996-2000,2003,2004,2012
# Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -21,8 +22,6 @@
subdir := grp subdir := grp
headers := grp.h headers := grp.h


distribute := tst_fgetgrent.c tst_fgetgrent.sh compat-initgroups.c

routines := fgetgrent initgroups setgroups \ routines := fgetgrent initgroups setgroups \
getgrent getgrgid getgrnam putgrent \ getgrent getgrgid getgrnam putgrent \
getgrent_r getgrgid_r getgrnam_r fgetgrent_r getgrent_r getgrgid_r getgrnam_r fgetgrent_r
Expand Down
10 changes: 4 additions & 6 deletions hesiod/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. # Copyright (C) 1997, 1998, 2000, 2001, 2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -20,16 +20,14 @@
# #
subdir := hesiod subdir := hesiod


distribute := hesiod.h hesiod_p.h README.hesiod nss_hesiod/nss_hesiod.h

extra-libs := libnss_hesiod extra-libs := libnss_hesiod
extra-libs-others = $(extra-libs) extra-libs-others = $(extra-libs)


subdir-dirs = nss_hesiod subdir-dirs = nss_hesiod
vpath %.c nss_hesiod vpath %.c nss_hesiod


libnss_hesiod-routines := hesiod hesiod-grp hesiod-init hesiod-proto \ libnss_hesiod-routines := hesiod hesiod-grp hesiod-init hesiod-proto \
hesiod-pwd hesiod-service hesiod-pwd hesiod-service
# Build only shared library # Build only shared library
libnss_hesiod-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_hesiod-inhibit-o = $(filter-out .os,$(object-suffixes))


Expand All @@ -41,6 +39,6 @@ include ../Rules
# The Hesiod NSS modules also needs the resolver and some help from # The Hesiod NSS modules also needs the resolver and some help from
# the file service. # the file service.
$(objpfx)libnss_hesiod.so: $(common-objpfx)resolv/libresolv.so \ $(objpfx)libnss_hesiod.so: $(common-objpfx)resolv/libresolv.so \
$(common-objpfx)nss/libnss_files.so \ $(common-objpfx)nss/libnss_files.so \
$(common-objpfx)libc.so \ $(common-objpfx)libc.so \
$(common-objpfx)libc_nonshared.a $(common-objpfx)libc_nonshared.a
7 changes: 2 additions & 5 deletions hurd/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002,2004,2006 # Copyright (C) 1991,92,93,94,95,96,97,98,99,2001,2002,2004,2006,2012
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.


Expand Down Expand Up @@ -29,7 +29,7 @@ headers = hurd.h $(interface-headers) \
userlink.h resource.h threadvar.h lookup.h) userlink.h resource.h threadvar.h lookup.h)


inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \ inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \
userlink.h threadvar.h port.h) userlink.h threadvar.h port.h)


# The RPC interfaces go in a separate library. # The RPC interfaces go in a separate library.
interface-library := libhurduser interface-library := libhurduser
Expand Down Expand Up @@ -67,12 +67,9 @@ dtable = dtable port2fd new-fd alloc-fd intern-fd \
getdport openport \ getdport openport \
fd-close fd-read fd-write hurdioctl ctty-input ctty-output fd-close fd-read fd-write hurdioctl ctty-input ctty-output
inlines = $(inline-headers:%.h=%-inlines) inlines = $(inline-headers:%.h=%-inlines)
distribute = hurdstartup.h hurdfault.h hurdhost.h \
faultexc.defs intr-rpc.defs intr-rpc.h intr-msg.h Notes


# XXX this is a temporary hack; see hurdmalloc.h # XXX this is a temporary hack; see hurdmalloc.h
routines += hurdmalloc routines += hurdmalloc
distribute += hurdmalloc.h


# Binary compatibility for libc.so.0.2[GLIBC_2.0]. # Binary compatibility for libc.so.0.2[GLIBC_2.0].
ifeq ($(versioning),yes) ifeq ($(versioning),yes)
Expand Down
4 changes: 0 additions & 4 deletions iconv/Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ CFLAGS-simple-hash.c = -I../locale


tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5


distribute = gconv_builtin.h gconv_int.h loop.c skeleton.c iconv_prog.h \
iconv_charmap.c dummy-repertoire.c gconv_charset.h strtab.c \
iconvconfig.h

others = iconv_prog iconvconfig others = iconv_prog iconvconfig
install-others-programs = $(inst_bindir)/iconv install-others-programs = $(inst_bindir)/iconv
install-sbin = iconvconfig install-sbin = iconvconfig
Expand Down
Loading

0 comments on commit a4300c7

Please sign in to comment.