diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-21 18:39:13 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-21 18:39:13 +0000 |
commit | 3cec2c22f8ea02ed27f549dd613feccc8fc77d8f (patch) | |
tree | 2892c7e5bb8fa2cce873dce43a47ff5428de2f41 | |
parent | f62b818736d2cb86db1d24a3a82dd6ec8154084e (diff) | |
download | FreeBSD-src-3cec2c22f8ea02ed27f549dd613feccc8fc77d8f.zip FreeBSD-src-3cec2c22f8ea02ed27f549dd613feccc8fc77d8f.tar.gz |
Replace realinstall: and META_MODE staging hacks with FILES mechanism.
This partially reverts r270170 for lib/csu/i386 while retaining the
change for using bsd.lib.mk.
These FILES groups could go into lib/csu/Makefile.inc but I've kept them
in the Makefiles for clarity.
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | gnu/lib/csu/Makefile | 20 | ||||
-rw-r--r-- | lib/csu/Makefile.inc | 5 | ||||
-rw-r--r-- | lib/csu/aarch64/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/amd64/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/arm/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/i386/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/mips/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/powerpc/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/powerpc64/Makefile | 10 | ||||
-rw-r--r-- | lib/csu/sparc64/Makefile | 10 |
10 files changed, 46 insertions, 59 deletions
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 1231443..e181bd5 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -.MAIN: all - .include <src.opts.mk> MK_SSP= no @@ -41,7 +39,12 @@ SRCS+= crtfastmath.c BEGINSRC?= crtstuff.c ENDSRC?= crtstuff.c -all: ${OBJS} ${SOBJS} ${TGTOBJS} +FILES= ${OBJS} ${SOBJS} ${TGTOBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} + ${OBJS} ${SOBJS}: ${SRCS:M*.h} CLEANFILES= ${OBJS} ${SOBJS} ${TGTOBJS} @@ -70,17 +73,6 @@ CLEANFILES+= tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile (cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}) -realinstall: -.for file in ${OBJS} ${SOBJS} ${TGTOBJS} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${file} ${DESTDIR}${LIBDIR}/${file} -.endfor - -.if ${MK_STAGING} == "yes" -STAGE_DIR= ${STAGE_LIBDIR} -STAGE_FILES= ${OBJS} ${SOBJS} ${TGTOBJS} -staging: stage_files -.endif .NOPATH: ${CLEANFILES} .include <bsd.lib.mk> diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index ff77f66..95d5c5e 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -7,8 +7,3 @@ SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/' NO_WMISSING_VARIABLE_DECLARATIONS= .include "../Makefile.inc" - -.if ${MK_STAGING} == "yes" && ${.TARGETS:Nall} == "" -FILES?= ${OBJS} -FILESDIR?= ${LIBDIR} -.endif diff --git a/lib/csu/aarch64/Makefile b/lib/csu/aarch64/Makefile index bf4c7b1..65284ae 100644 --- a/lib/csu/aarch64/Makefile +++ b/lib/csu/aarch64/Makefile @@ -8,7 +8,11 @@ OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s @@ -37,8 +41,4 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index 80d14a7..d293534 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -9,7 +9,11 @@ CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include CFLAGS+= -fno-omit-frame-pointer -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s @@ -38,8 +42,4 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile index bf4c7b1..65284ae 100644 --- a/lib/csu/arm/Makefile +++ b/lib/csu/arm/Makefile @@ -8,7 +8,11 @@ OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s @@ -37,8 +41,4 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index d5ca479..01fe0d8 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -8,7 +8,11 @@ OBJS+= gcrt1.o crt1.o Scrt1.o CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s @@ -48,8 +52,4 @@ Scrt1.o: Scrt1_c.o crt1_s.o ${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o ${OBJCOPY} --localize-symbol _start1 Scrt1.o -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/mips/Makefile b/lib/csu/mips/Makefile index bf4c7b1..65284ae 100644 --- a/lib/csu/mips/Makefile +++ b/lib/csu/mips/Makefile @@ -8,7 +8,11 @@ OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s @@ -37,8 +41,4 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile index bf4c7b1..65284ae 100644 --- a/lib/csu/powerpc/Makefile +++ b/lib/csu/powerpc/Makefile @@ -8,7 +8,11 @@ OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s @@ -37,8 +41,4 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile index 1c93355..fab7c5d 100644 --- a/lib/csu/powerpc64/Makefile +++ b/lib/csu/powerpc64/Makefile @@ -16,7 +16,11 @@ CFLAGS+= -I${.CURDIR}/../common \ CC:= gcc COMPILER_TYPE:= gcc -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s @@ -45,8 +49,4 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile index 7f8dd7a..2680789 100644 --- a/lib/csu/sparc64/Makefile +++ b/lib/csu/sparc64/Makefile @@ -7,7 +7,11 @@ OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include -all: ${OBJS} +FILES= ${OBJS} +FILESMODE= ${LIBMODE} +FILESOWN= ${LIBOWN} +FILESGRP= ${LIBGRP} +FILESDIR= ${LIBDIR} CLEANFILES= ${OBJS} @@ -17,8 +21,4 @@ gcrt1.o: crt1.c Scrt1.o: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1.o ${.ALLSRC} -realinstall: - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${OBJS} ${DESTDIR}${LIBDIR} - .include <bsd.lib.mk> |