From 4f42ff3c31a16c8aea8bb76227856615e0b3ccfb Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 31 Aug 2012 14:51:45 -0500 Subject: [PATCH] Pretty make output for tsalvaged, lib[u]afs Change-Id: I852f862c029cad60dc7871ab22367fb266314244 Reviewed-on: http://gerrit.openafs.org/8108 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- src/libafs/Makefile.common.in | 6 +++--- src/libuafs/Makefile.common.in | 6 +++--- src/tsalvaged/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in index d43c64c02..dfcde6958 100644 --- a/src/libafs/Makefile.common.in +++ b/src/libafs/Makefile.common.in @@ -47,9 +47,9 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \ $(CC) $(COMMON_INCLUDE) $(CFLAGS) -P -c $< .c.o: - $(CC) $(COMMON_INCLUDE) $(CFLAGS) $(CFLAGS-$(@)) $(KERN_DBG) -c $< -CRULE_NOOPT= $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS) $(CFLAGS-$(@)) -o $@ -c -CRULE_OPT= $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS) $(CFLAGS-$@) -o $@ -c + $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CFLAGS) $(CFLAGS-$(@)) $(KERN_DBG) -c $< +CRULE_NOOPT= $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS) $(CFLAGS-$(@)) -o $@ -c +CRULE_OPT= $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS) $(CFLAGS-$@) -o $@ -c system: all diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in index 28cd132ba..192101a2c 100644 --- a/src/libuafs/Makefile.common.in +++ b/src/libuafs/Makefile.common.in @@ -104,9 +104,9 @@ linktest: UAFS/$(LIBUAFS) ${TOP_LIBDIR}/libafsutil.a $(TOP_LIBDIR)/libopr.a \ $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS) -CRULE1= $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $? -CRULE2= $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $? -CRULEPIC=$(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $? +CRULE1= $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $? +CRULE2= $(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $? +CRULEPIC=$(RUN_CC) $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $? UAFSOBJ = \ $(UOBJ)/afs_atomlist.o \ diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index ec1c308d8..2ad5936f7 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -20,7 +20,7 @@ MODULE_CFLAGS = -DRXDEBUG -DFSSYNC_BUILD_CLIENT \ SCFLAGS=$(COMMON_CFLAGS) -I.. -DRXDEBUG -DFSSYNC_BUILD_CLIENT \ -DAFS_DEMAND_ATTACH_UTIL -SCCRULE=${MT_CC} ${SCFLAGS} -c $? -o $@ +SCCRULE=$(RUN_CC) ${MT_CC} ${SCFLAGS} -c $? -o $@ DIR=$(srcdir)/../dir VOL=$(srcdir)/../vol -- 2.39.5