[m-rev.] diff: remove .ss and .pic_ss targets from Mmakefiles

Julien Fischer jfischer at opturion.com
Wed Feb 20 16:38:39 AEDT 2013


Remove unused targets from Mmakefiles.

browser/Mmakefile:
compiler/Mmakefile:
library/Mmakefile:
mdbcomp/Mmakefile:
profiler/Mmakefile:
slice/Mmakefile:
ssdb/Mmakefile:
	Delete .ss and .pic_ss targets.
	These were only required for the GCC backend.

Julien.

diff --git a/browser/Mmakefile b/browser/Mmakefile
index e35df80..66f7319 100644
--- a/browser/Mmakefile
+++ b/browser/Mmakefile
@@ -155,13 +155,11 @@ $(DEPENDS): Mercury.modules
 # lib$(BROWSER_LIB_NAME).int3s: lib$(MDBCOMP_LIB_NAME).int3s
 # lib$(BROWSER_LIB_NAME).ints: lib$(MDBCOMP_LIB_NAME).ints
 # lib$(BROWSER_LIB_NAME).cs: lib$(MDBCOMP_LIB_NAME).cs
-# lib$(BROWSER_LIB_NAME).ss: lib$(MDBCOMP_LIB_NAME).ss
 # lib$(BROWSER_LIB_NAME).ils: lib$(MDBCOMP_LIB_NAME).ils
 # lib$(BROWSER_LIB_NAME).javas: lib$(MDBCOMP_LIB_NAME).javas
 # lib$(BROWSER_LIB_NAME).check: lib$(MDBCOMP_LIB_NAME).check
 # $($(BROWSER_LIB_NAME).ints): $($(MDBCOMP_LIB_NAME).ints)
 # $($(BROWSER_LIB_NAME).cs): $($(MDBCOMP_LIB_NAME).cs)
-# $($(BROWSER_LIB_NAME).ss): $($(MDBCOMP_LIB_NAME).ss)
 # $($(BROWSER_LIB_NAME).ils): $($(MDBCOMP_LIB_NAME).ils)
 # $($(BROWSER_LIB_NAME).javas): $($(MDBCOMP_LIB_NAME).java_dates)
 # $($(BROWSER_LIB_NAME).c_dates): $($(MDBCOMP_LIB_NAME).c_dates)
@@ -218,16 +216,14 @@ dates:

 #-----------------------------------------------------------------------------#

-.PHONY: os cs ss ils
+.PHONY: os cs ils
 ifneq ($(MMAKE_USE_MMC_MAKE),yes)
 os: $($(BROWSER_LIB_NAME).os)
 cs: $($(BROWSER_LIB_NAME).cs)
-ss: $($(BROWSER_LIB_NAME).ss)
 ils: $($(BROWSER_LIB_NAME).ils)
 else
 os: $(BROWSER_LIB_NAME).os
 cs: $(BROWSER_LIB_NAME).cs
-ss: $(BROWSER_LIB_NAME).ss
 ils: $(BROWSER_LIB_NAME).ils
 endif

diff --git a/compiler/Mmakefile b/compiler/Mmakefile
index 91f7174..d38fbf4 100644
--- a/compiler/Mmakefile
+++ b/compiler/Mmakefile
@@ -205,7 +205,7 @@ dates:
 #-----------------------------------------------------------------------------#

 # Note that the cs and os targets don't build top_level_init.{c,o}
-.PHONY: os cs ss ils
+.PHONY: os cs ils
 ifneq ($(MMAKE_USE_MMC_MAKE),yes)
 os: $($(MC_PROG).os)
 cs: $($(MC_PROG).cs)
diff --git a/library/Mmakefile b/library/Mmakefile
index f659d54..aa82668 100644
--- a/library/Mmakefile
+++ b/library/Mmakefile
@@ -231,25 +231,15 @@ dates:

 #-----------------------------------------------------------------------------#

-# Note that we need to explicitly mention $($(STD_LIB_NAME).pic_ss) somewhere
-# in the Mmakefile, otherwise it won't build properly with --target asm:
-# GNU Make's pattern rule algorithm will try to use the .m -> .c -> .pic_o
-# rule chain rather than the .m -> .pic_s_date -> .pic_s -> .pic_o chain.
-# So don't remove the pic_ss target here.
-
-.PHONY: os cs ss pic_ss ils javas
+.PHONY: os cs ils javas
 ifneq ($(MMAKE_USE_MMC_MAKE),yes)
 os: $($(STD_LIB_NAME).os)
 cs: $($(STD_LIB_NAME).cs)
-ss: $($(STD_LIB_NAME).ss)
-pic_ss: $($(STD_LIB_NAME).pic_ss)
 ils: $($(STD_LIB_NAME).ils)
 javas: $($(STD_LIB_NAME).javas)
 else
 os: $(STD_LIB_NAME).os
 cs: $(STD_LIB_NAME).cs
-ss: $(STD_LIB_NAME).ss
-pic_ss: $(STD_LIB_NAME).pic_ss
 ils: $(STD_LIB_NAME).ils
 javas: $(STD_LIB_NAME).javas
 endif
diff --git a/mdbcomp/Mmakefile b/mdbcomp/Mmakefile
index 0591d33..a8559db 100644
--- a/mdbcomp/Mmakefile
+++ b/mdbcomp/Mmakefile
@@ -181,16 +181,14 @@ dates:

 #-----------------------------------------------------------------------------#

-.PHONY: os cs ss ils
+.PHONY: os cs ils
 ifneq ($(MMAKE_USE_MMC_MAKE),yes)
 os: $($(MDBCOMP_LIB_NAME).os)
 cs: $($(MDBCOMP_LIB_NAME).cs)
-ss: $($(MDBCOMP_LIB_NAME).ss)
 ils: $($(MDBCOMP_LIB_NAME).ils)
 else
 os: $(MDBCOMP_LIB_NAME).os
 cs: $(MDBCOMP_LIB_NAME).cs
-ss: $(MDBCOMP_LIB_NAME).ss
 ils: $(MDBCOMP_LIB_NAME).ils
 endif

diff --git a/profiler/Mmakefile b/profiler/Mmakefile
index a84f078..79222e3 100644
--- a/profiler/Mmakefile
+++ b/profiler/Mmakefile
@@ -89,10 +89,9 @@ dates:

 #-----------------------------------------------------------------------------#

-.PHONY: os cs ss ils
+.PHONY: os cs ils
 os: $(mercury_profile.os) $(os_subdir)mercury_profile_init.o
 cs: $(mercury_profile.cs) $(cs_subdir)mercury_profile_init.c
-ss: $(mercury_profile.ss)
 ils: $(mercury_profile.ils)

 #-----------------------------------------------------------------------------#
diff --git a/slice/Mmakefile b/slice/Mmakefile
index 15f4de7..53e934c 100644
--- a/slice/Mmakefile
+++ b/slice/Mmakefile
@@ -188,7 +188,7 @@ dates:

 #-----------------------------------------------------------------------------#

-.PHONY: os cs ss ils
+.PHONY: os cs ls
 os:	$(mslice.os) $(mdice.os) $(mtc_union.os) \
 	$(os_subdir)mslice_init.o $(os_subdir)mdice_init.o \
 	$(os_subdir)mtc_union.o $(os_subdir)mcov.o \
@@ -197,7 +197,6 @@ cs:	$(mslice.cs) $(mdice.cs) $(mtc_union.cs) \
 	$(cs_subdir)mslice_init.c $(cs_subdir)mdice_init.c \
 	$(cs_subdir)mtc_union.c $(cs_subdir)mcov.c \
 	$(cs_subdir)mtc_diff.c
-ss:	$(mslice.ss) $(mdice.ss) $(mtc_union.ss) $(mcov.ss) $(mtc_diff.ss)
 ils:	$(mslice.ils) $(mdice.ils) $(mtc_union.ils) $(mcov.ils) $(mtc_diff.ils)

 #-----------------------------------------------------------------------------#
diff --git a/ssdb/Mmakefile b/ssdb/Mmakefile
index bdeeaec..6da1d32 100644
--- a/ssdb/Mmakefile
+++ b/ssdb/Mmakefile
@@ -154,13 +154,11 @@ $(DEPENDS): Mercury.modules
 # lib$(SSDB_LIB_NAME).int3s: lib$(MDBCOMP_LIB_NAME).int3s
 # lib$(SSDB_LIB_NAME).ints: lib$(MDBCOMP_LIB_NAME).ints
 # lib$(SSDB_LIB_NAME).cs: lib$(MDBCOMP_LIB_NAME).cs
-# lib$(SSDB_LIB_NAME).ss: lib$(MDBCOMP_LIB_NAME).ss
 # lib$(SSDB_LIB_NAME).ils: lib$(MDBCOMP_LIB_NAME).ils
 # lib$(SSDB_LIB_NAME).javas: lib$(MDBCOMP_LIB_NAME).javas
 # lib$(SSDB_LIB_NAME).check: lib$(MDBCOMP_LIB_NAME).check
 # $($(SSDB_LIB_NAME).ints): $($(MDBCOMP_LIB_NAME).ints)
 # $($(SSDB_LIB_NAME).cs): $($(MDBCOMP_LIB_NAME).cs)
-# $($(SSDB_LIB_NAME).ss): $($(MDBCOMP_LIB_NAME).ss)
 # $($(SSDB_LIB_NAME).ils): $($(MDBCOMP_LIB_NAME).ils)
 # $($(SSDB_LIB_NAME).javas): $($(MDBCOMP_LIB_NAME).java_dates)
 # $($(SSDB_LIB_NAME).c_dates): $($(MDBCOMP_LIB_NAME).c_dates)
@@ -216,16 +214,14 @@ dates:

 #-----------------------------------------------------------------------------#

-.PHONY: os cs ss ils
+.PHONY: os cs ils
 ifneq ($(MMAKE_USE_MMC_MAKE),yes)
 os: $($(SSDB_LIB_NAME).os)
 cs: $($(SSDB_LIB_NAME).cs)
-ss: $($(SSDB_LIB_NAME).ss)
 ils: $($(SSDB_LIB_NAME).ils)
 else
 os: $(SSDB_LIB_NAME).os
 cs: $(SSDB_LIB_NAME).cs
-ss: $(SSDB_LIB_NAME).ss
 ils: $(SSDB_LIB_NAME).ils
 endif



More information about the reviews mailing list