Print this page
4815 Want rm support for -v option
4816 rm does not print error messages when -f is used

*** 20,71 **** # # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # PROG= rm ! XPG4PROG= rm RMOBJ1= rm.o RMOBJ= $(RMOBJ1) getresponse.o ! XPG4RMOBJ= $(RMOBJ:%.o=xpg4_%.o) SRCS= $(RMOBJ1:%.o=%.c) $(SRC)/common/util/getresponse.c include ../Makefile.cmd CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses ! $(XPG4) := CFLAGS += -DXPG4 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I $(SRC)/common/util LINTFLAGS += -u .KEEP_STATE: ! all: $(PROG) $(XPG4) ! install: all $(ROOTPROG) $(ROOTXPG4PROG) $(PROG): $(RMOBJ) $(LINK.c) $(RMOBJ) -o $@ $(LDLIBS) $(POST_PROCESS) ! $(XPG4): $(XPG4RMOBJ) ! $(LINK.c) $(XPG4RMOBJ) -o $@ $(LDLIBS) $(POST_PROCESS) %.o: $(SRC)/common/util/%.c $(COMPILE.c) $(OUTPUT_OPTION) $< $(POST_PROCESS_O) ! xpg4_%.o: %.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) ! xpg4_%.o: $(SRC)/common/util/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) clean: ! $(RM) $(RMOBJ) $(XPG4RMOBJ) lint: lint_SRCS include ../Makefile.targ --- 20,78 ---- # # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # + # Copyright 2014 Andrew Stormont. + # PROG= rm ! HASPROG= $(PROG:%=%.has) RMOBJ1= rm.o RMOBJ= $(RMOBJ1) getresponse.o ! HASRMOBJ= $(RMOBJ:%.o=has_%.o) SRCS= $(RMOBJ1:%.o=%.c) $(SRC)/common/util/getresponse.c include ../Makefile.cmd CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses ! $(HASPROG) := CFLAGS += -DSUS CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I $(SRC)/common/util LINTFLAGS += -u .KEEP_STATE: ! all: $(PROG) $(HASPROG) ! install: all $(ROOTPROG) $(ROOTHASBINPROG) $(PROG): $(RMOBJ) $(LINK.c) $(RMOBJ) -o $@ $(LDLIBS) $(POST_PROCESS) ! $(HASPROG): $(HASRMOBJ) ! $(LINK.c) $(HASRMOBJ) -o $@ $(LDLIBS) $(POST_PROCESS) %.o: $(SRC)/common/util/%.c $(COMPILE.c) $(OUTPUT_OPTION) $< $(POST_PROCESS_O) ! has_%.o: %.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) ! has_%.o: $(SRC)/common/util/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) clean: ! $(RM) $(RMOBJ) $(HASRMOBJ) $(HASPROG) lint: lint_SRCS + $(ROOTHASBIN)/%: %.has + $(INS.rename) + + FRC: + include ../Makefile.targ