From 3cec2c22f8ea02ed27f549dd613feccc8fc77d8f Mon Sep 17 00:00:00 2001 From: bdrewery Date: Mon, 21 Sep 2015 18:39:13 +0000 Subject: 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 --- gnu/lib/csu/Makefile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'gnu') 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 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 -- cgit v1.1