summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-09 16:59:07 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-09 16:59:07 +0000
commitdaa664da37ef23dc268355b2591680eca31edc04 (patch)
tree3a295fad3f56209f8b20383ed47f598fe46a61ca
parent239956cf20015ab821bc9bcead779e75bffe1a09 (diff)
downloadATCD-daa664da37ef23dc268355b2591680eca31edc04.tar.gz
replaced hard-coded /bin/rm -f with $(RM)
-rw-r--r--include/makeinclude/platform_chorus_ghs.GNU2
-rw-r--r--include/makeinclude/platform_irix6.x-sgic++.GNU2
-rw-r--r--include/makeinclude/platform_osf1_3.2.GNU2
-rw-r--r--include/makeinclude/platform_osf1_4.0.GNU2
-rw-r--r--include/makeinclude/platform_osf1_4.0_rcc.GNU2
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU4
6 files changed, 7 insertions, 7 deletions
diff --git a/include/makeinclude/platform_chorus_ghs.GNU b/include/makeinclude/platform_chorus_ghs.GNU
index d86db41c12f..81c21e8cc20 100644
--- a/include/makeinclude/platform_chorus_ghs.GNU
+++ b/include/makeinclude/platform_chorus_ghs.GNU
@@ -70,4 +70,4 @@ POSTLINK = ; $(CC) -groot=$(MVME_DIR) -alttools=$(GHS_DIR) -68040 \
$(MVME_DIR)/lib/crt/crti.o $@ \
$(MVME_DIR)/lib/crt/crtn.o \
-locatedprogram -r; \
- mv -f $@.final $@; chmod +x $@; /bin/rm -f /tmp/gh_*.[os]
+ mv -f $@.final $@; chmod +x $@; $(RM) /tmp/gh_*.[os]
diff --git a/include/makeinclude/platform_irix6.x-sgic++.GNU b/include/makeinclude/platform_irix6.x-sgic++.GNU
index 8e227fff56a..c200c311882 100644
--- a/include/makeinclude/platform_irix6.x-sgic++.GNU
+++ b/include/makeinclude/platform_irix6.x-sgic++.GNU
@@ -56,7 +56,7 @@ AR = ar
ARFLAGS = r
RANLIB = echo
SOFLAGS = -shared $(CCFLAGS) $(CPPFLAGS) -all
-SOBUILD = /bin/rm -f $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
/bin/ln $(VSHDIR)$*.o $@
# The math library
diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2.GNU
index 1dea4d671fd..d2da4954e75 100644
--- a/include/makeinclude/platform_osf1_3.2.GNU
+++ b/include/makeinclude/platform_osf1_3.2.GNU
@@ -23,5 +23,5 @@ RANLIB = /usr/bin/true
#### SOFLAGS = -shared
SOFLAGS = -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx \
-L$(ACE_ROOT)/ace -L./ -g2 -O0 -shared
-SOBUILD = /bin/rm -f $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
ln $(VSHDIR)$*.o $@
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index 677dca88210..3955ee07536 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -50,7 +50,7 @@ RANLIB = @true
#### workaround recommended in PTR 43-4-204.
SOFLAGS = -hidden /usr/lib/cmplrs/cxx/libcxxstd.a -non_hidden \
-shared -use_ld_input $(ACELIB)
-SOBUILD = /bin/rm -f $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
ln $(VSHDIR)$*.o $@
ifndef exceptions
diff --git a/include/makeinclude/platform_osf1_4.0_rcc.GNU b/include/makeinclude/platform_osf1_4.0_rcc.GNU
index 24e918c507e..f188fe2d682 100644
--- a/include/makeinclude/platform_osf1_4.0_rcc.GNU
+++ b/include/makeinclude/platform_osf1_4.0_rcc.GNU
@@ -21,5 +21,5 @@ ARFLAGS = cruvZ
# so there is no need for ranlib
RANLIB = /usr/bin/true
SOFLAGS = -shared # -use_ld_input $(ACELIB)
-SOBUILD = /bin/rm -f $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
ln $(VSHDIR)$*.o $@
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index bcd2005a0ba..341976c20a2 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -98,8 +98,8 @@ else
#### a .so extension. Rather than muck with the ACE build rules and
#### risk upsetting builds on other platforms, just ln the output
#### after building it.
- SOBUILD = /bin/rm -f $@; \
- $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && /bin/ln $(VSHDIR)$*.o $@
+ SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+ /bin/ln $(VSHDIR)$*.o $@
endif # BIN
#### The following macro overrides enable creation of fast executables.