[m-rev.] for review: Allow installation with LIBRARY_INTERMODULE=no for development.

Peter Wang novalazy at gmail.com
Wed Mar 24 13:22:15 AEDT 2021


library/Mmakefile:
   Delete check to stop installation when LIBRARY_INTERMODULE=no is set.
   Users are unlikely to set that by accident, and it is useful for
   developers to be able to make test installations without incurring
   the cost of generating .opt and especially .trans_opt files for every
   little change to the library.

diff --git a/library/Mmakefile b/library/Mmakefile
index 3800373ac..017f79c52 100644
--- a/library/Mmakefile
+++ b/library/Mmakefile
@@ -519,16 +519,8 @@ realclean_local:
 
 #-----------------------------------------------------------------------------#
 
-ifeq ($(LIBRARY_INTERMODULE),yes)
-
 # Installation targets
 
-# LIBRARY_INTERMODULE should be turned off only during development.
-# A full install requires the library's .opt and .trans_opt files.
-
-# If you add a new target below, please add a parallel target for the
-# case LIBRARY_INTERMODULE != yes.
-
 .PHONY: install
 install: install_mercury
 
@@ -562,38 +554,4 @@ install_library: install_mer_rt lib$(STD_LIB_NAME).install
 
 endif	#ifneq ($(MMAKE_USE_MMC_MAKE),yes)
 
-else
-
-.PHONY: install
-install:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-.PHONY: install_all
-install_all:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-.PHONY: install_mercury
-install_mercury:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-.PHONY: install_ints
-install_ints:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-.PHONY: install_hdrs
-install_hdrs:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-.PHONY: install_library
-install_library:
-	echo "Can't do make install without LIBRARY_INTERMODULE=yes"
-	exit 1
-
-endif
-
 #-----------------------------------------------------------------------------#
-- 
2.30.0



More information about the reviews mailing list