diff --git a/scripts/Mmake.vars.in b/scripts/Mmake.vars.in index 7b14c15f8..5165ff493 100644 --- a/scripts/Mmake.vars.in +++ b/scripts/Mmake.vars.in @@ -529,8 +529,6 @@ useds_subdir=$(SUBDIR)useds/ mihs_subdir=$(SUBDIR)mihs/ cs_subdir=$(SUBDIR)cs/ dlls_subdir=$(SUBDIR)dlls/ -ss_subdir=$(SUBDIR)ss/ -pic_ss_subdir=$(SUBDIR)pic_ss/ os_subdir=$(SUBDIR)os/ javas_subdir=$(SUBDIR)javas/ dirs_subdir=$(SUBDIR)dirs/ @@ -565,8 +563,6 @@ useds_subdir= mihs_subdir= cs_subdir= dlls_subdir= -ss_subdir= -pic_ss_subdir= os_subdir= javas_subdir= dirs_subdir= diff --git a/tests/par_conj/Mmakefile b/tests/par_conj/Mmakefile index d04b34bab..793a36847 100644 --- a/tests/par_conj/Mmakefile +++ b/tests/par_conj/Mmakefile @@ -104,24 +104,13 @@ endif # `mmc --make' doesn't expect subdirectories to appear in targets. ifeq ($(MMAKE_USE_MMC_MAKE),yes) OS_SUBDIR= -ILS_SUBDIR= -DLLS_SUBDIR= else OS_SUBDIR=$(os_subdir) -ILS_SUBDIR=$(ils_subdir) -DLLS_SUBDIR=$(dlls_subdir) endif - -ifeq ($(findstring il,$(GRADE)),il) - TARGET_OBJ_EXT=dll - TARGET_OBJ_SUBDIR=$(DLLS_SUBDIR) -else - TARGET_OBJ_EXT=$(O) - TARGET_OBJ_SUBDIR=$(OS_SUBDIR) -endif -OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) \ - $(IL_PROGS:%=$(ILS_SUBDIR)%.il) +TARGET_OBJ_EXT=$(O) +TARGET_OBJ_SUBDIR=$(OS_SUBDIR) +OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) #-----------------------------------------------------------------------------# diff --git a/tests/stm/Mmakefile b/tests/stm/Mmakefile index 58a5d9ed7..a8e7d39da 100644 --- a/tests/stm/Mmakefile +++ b/tests/stm/Mmakefile @@ -62,23 +62,13 @@ endif # `mmc --make' doesn't expect subdirectories to appear in targets. ifeq ($(MMAKE_USE_MMC_MAKE),yes) OS_SUBDIR = -ILS_SUBDIR = -DLLS_SUBDIR = else OS_SUBDIR = $(os_subdir) -ILS_SUBDIR = $(ils_subdir) -DLLS_SUBDIR = $(dlls_subdir) endif -ifeq ($(findstring il,$(GRADE)),il) - TARGET_OBJ_EXT = dll - TARGET_OBJ_SUBDIR = $(DLLS_SUBDIR) -else - TARGET_OBJ_EXT = $(O) - TARGET_OBJ_SUBDIR = $(OS_SUBDIR) -endif -OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) \ - $(IL_PROGS:%=$(ILS_SUBDIR)%.il) +TARGET_OBJ_EXT = $(O) +TARGET_OBJ_SUBDIR = $(OS_SUBDIR) +OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) #-----------------------------------------------------------------------------# diff --git a/tools/bootcheck b/tools/bootcheck index 86e2f9c0f..5a1aebafe 100755 --- a/tools/bootcheck +++ b/tools/bootcheck @@ -434,13 +434,9 @@ fi case $use_subdirs in yes) cs_subdir=Mercury/cs/ - ss_subdir=Mercury/ss/ - ils_subdir=Mercury/ils/ ;; no) cs_subdir= - ss_subdir= - ils_subdir= ;; esac