mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-18 02:43:40 +00:00
Fix bugs that were stopping *.res and *.out files being cleaned up properly.
Estimated hours taken: 0.5 Fix bugs that were stopping *.res and *.out files being cleaned up properly. tests/Mmake.common: tests/general/accumulator/Mmakefile: tests/invalid/Mmakefile: tests/misc_tests/Mmakefile: tests/tabling/Mmakefile: tests/term/Mmakefile: tests/valid/Mmakefile: tests/warnings/Mmakefile: Make cleaning tasks depend on (real)clean_local rather than (real)clean. This is because tests/startup and tests/shutdown use the *_local targets. tests/general/Mmakefile: Fix bugs in the recursive mmake calls.
This commit is contained in:
@@ -35,7 +35,7 @@ DIFF_OPTS=-c
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
clean: clean_out clean_res
|
||||
clean_local: clean_out clean_res
|
||||
|
||||
clean_mc: clean_c clean_o clean_out clean_res
|
||||
|
||||
|
||||
@@ -117,32 +117,32 @@ SUBDIRS = accumulator
|
||||
|
||||
check_subdirs:
|
||||
for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) check_subdirs) || exit 1; \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) check) || exit 1; \
|
||||
done
|
||||
|
||||
dep_subdirs:
|
||||
for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) dep_subdirs) || exit 1; \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) dep) || exit 1; \
|
||||
done
|
||||
|
||||
depend_subdirs:
|
||||
for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) depend_subdirs) || exit 1; \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) depend) || exit 1; \
|
||||
done
|
||||
|
||||
realclean_subdirs:
|
||||
for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) realclean_subdirs) || exit 1; \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) realclean) || exit 1; \
|
||||
done
|
||||
|
||||
clean_subdirs:
|
||||
for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) clean_subdirs) || exit 1; \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) clean) || exit 1; \
|
||||
done
|
||||
|
||||
all_subdirs:
|
||||
for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) all_subdirs) || exit 1; \
|
||||
(cd $$dir && $(SUBDIR_MMAKE) all) || exit 1; \
|
||||
done
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
@@ -54,7 +54,7 @@ mods: $(MODS)
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
realclean: clean_hlds_dump
|
||||
realclean_local: clean_hlds_dump
|
||||
|
||||
clean_hlds_dump:
|
||||
-rm -f *hlds_dump*
|
||||
|
||||
@@ -118,7 +118,7 @@ errs: $(ERRS)
|
||||
depend: aditi_update_errors.depend aditi_update_mode_errors.depend \
|
||||
test_nested.depend partial_implied_mode.depend
|
||||
|
||||
clean:
|
||||
clean_local:
|
||||
rm -f *.err *.err_res
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
@@ -37,7 +37,7 @@ check: $(OUTS) $(RESS)
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
clean: clean_ugly
|
||||
clean_local: clean_ugly
|
||||
|
||||
clean_ugly:
|
||||
rm -fr *.ugly
|
||||
|
||||
@@ -69,8 +69,8 @@ check: $(OUTS) $(RESS)
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
clean:
|
||||
clean_local:
|
||||
|
||||
realclean:
|
||||
realclean_local:
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
@@ -90,10 +90,10 @@ trans_opts: $(TRANS_OPTS)
|
||||
|
||||
check: $(TRANS_OPT_RESS)
|
||||
|
||||
clean:
|
||||
clean_local:
|
||||
rm -f *.trans_opt_err
|
||||
|
||||
realclean:
|
||||
realclean_local:
|
||||
rm -f *.trans_opt_res
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
@@ -199,7 +199,7 @@ printtests:
|
||||
printobjs:
|
||||
@echo $(OBJS)
|
||||
|
||||
clean:
|
||||
clean_local:
|
||||
rm -f *.err *.h
|
||||
|
||||
#-----------------------------------------------------------------------------#
|
||||
|
||||
@@ -45,7 +45,7 @@ check: $(ERRS) $(RESS)
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
clean: clean_err clean_res
|
||||
clean_local: clean_err clean_res
|
||||
|
||||
clean_mc: clean_c clean_o clean_err clean_res
|
||||
|
||||
|
||||
Reference in New Issue
Block a user