summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-12 19:28:14 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-12 19:28:14 +0000
commit7f236e58379a979d57b443ca1ec6cde60c638f47 (patch)
tree4335618f2a00276476d3f0f37764799c625fe056
parent057a4a51d0969825c9c759522110a71ab98f791f (diff)
downloadATCD-7f236e58379a979d57b443ca1ec6cde60c638f47.tar.gz
(realclean.local): added BIN2, LIB2, SHLIB2, and SHLIBA2 to support
subsetting. It allows realclean to remove old BIN, LIB, SHLIB, and SHLIBA targets after remove the ace_components information file.
-rw-r--r--include/makeinclude/rules.local.GNU14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 3808fc73ca2..80a9aa29aee 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -159,12 +159,12 @@ endif
#----------------------------------------------------------------------------
clean.local:
- -$(RM) -f *.o *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -$(RM) -rf $(OBJDIRS) $(TEMPINCDIR) ptrepository Templates.DB \
- gcctemp.c gcctemp so_locations
+ -$(RM) *.o *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+ -$(RM) -r $(OBJDIRS) $(TEMPINCDIR) ptrepository Templates.DB \
+ gcctemp.c gcctemp so_locations
realclean.local: clean.local
- -$(RM) -f $(BIN:%=%) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%)
+ -$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
#----------------------------------------------------------------------------
# Dependency generation target
@@ -185,7 +185,7 @@ ifndef SOEXT
endif # SOEXT
depend.local: $(MAKEFILE)
- @$(RM) -f $(MAKEFILE).old
+ @$(RM) $(MAKEFILE).old
@cp $(MAKEFILE) $(MAKEFILE).old
$(ACE_ROOT)/bin/g++dep -f $(MAKEFILE) $(CPPFLAGS) -DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
@cat $(MAKEFILE) | \
@@ -196,13 +196,13 @@ depend.local: $(MAKEFILE)
-e "s;\([-a-zA-Z0-9._]*\)\.o:;.obj/\1.o .obj/\1.$(SOEXT) $(VSHDIR)\1.o $(VSHDIR)\1.$(SOEXT):;" \
> $(MAKEFILE).new
@cat $(MAKEFILE).new >$(MAKEFILE)
- @$(RM) -f $(MAKEFILE).new
+ @$(RM) $(MAKEFILE).new
@if cmp -s $(MAKEFILE) $(MAKEFILE).old ;\
then echo "Makefile dependencies unchanged." ;\
else \
echo "Makefile dependencies updated." ;\
fi ;\
- $(RM) -f $(MAKEFILE).old ;
+ $(RM) $(MAKEFILE).old ;
#----------------------------------------------------------------------------
# RCS info target