[m-rev.] trivial diff: delete more install_split_library stuff

Julien Fischer juliensf at csse.unimelb.edu.au
Mon Jan 8 17:57:46 AEDT 2007


Estimated hours taken: 0.1
Branches: main

Remove more stuff related to the now-deleted --split-c-files option.

library/Mmakefile:
tools/test_mercury:
 	Delete the install_split_library target.

Julien.

Index: library/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.146
diff -u -r1.146 Mmakefile
--- library/Mmakefile	10 Jan 2006 05:30:36 -0000	1.146
+++ library/Mmakefile	8 Jan 2007 06:52:47 -0000
@@ -559,11 +559,6 @@

  endif  #ifneq (,$(findstring il,$(GRADE)))

-# $(STD_LIB_NAME).split.$A is a version of lib$(STD_LIB_NAME).$A
-# that has been compiled with `--split-c-files'.
-.PHONY: install_split_library
-install_split_library: lib$(STD_LIB_NAME).install_split_library
-
  else	#ifneq ($(MMAKE_USE_MMC_MAKE),yes)

  # Prevent `mmc --make' from installing the default set of grades for
@@ -615,11 +610,6 @@
  	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
  	exit 1

-.PHONY: install_split_library
-install_split_library:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
  endif

  .PHONY: munge_dll_debug_info
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.309
diff -u -r1.309 test_mercury
--- tools/test_mercury	21 Dec 2006 06:11:27 -0000	1.309
+++ tools/test_mercury	8 Jan 2007 06:55:11 -0000
@@ -711,15 +711,6 @@
      		set_status "install_main"
      mmake install_grades MMAKEFLAGS=$PARALLEL || \
      		set_status "install_grades"
-    case "$INSTALL_GRADE" in
-	hl*)
-	    	# --split-c-files is not supported for the hl* grades
-	    	;;
-	*)	mmake install_split_library \
-			LIBGRADES=$INSTALL_GRADE MMAKEFLAGS=$PARALLEL || \
-    			set_status "install_split_library"
-		;;
-    esac

      case $install_anyway_stage1 in
          false)	cd ../.. || set_status "cd ../.." ;;

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list