[m-rev.] diff: fix Mmake targets for tags

Zoltan Somogyi zs at csse.unimelb.edu.au
Mon Aug 17 20:18:47 AEST 2009


compiler/Mmakefile:
deep_profiler/Mmakefile:
slice/Mmakefile:
	Fix several occurrences of a bug that prevented the tags files from
	being rebuilt, even when requested, when source files changed in other
	directories. The bug was the attempt to use "*.m" as a pattern
	in contexts where it was taken as just a string.

Zoltan.

Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.104
diff -u -b -r1.104 Mmakefile
--- compiler/Mmakefile	30 Jul 2009 02:41:52 -0000	1.104
+++ compiler/Mmakefile	31 Jul 2009 07:42:09 -0000
@@ -281,7 +281,10 @@
 .PHONY: tags
 tags:	.compiler_tags
 
-.compiler_tags:	$(PREPROCESSED_M_FILES) *.m $(LIBRARY_DIR)/*.m $(MDBCOMP_DIR)/*.m
+.compiler_tags:	$(PREPROCESSED_M_FILES) \
+		$(wildcard *.m) \
+		$(wildcard $(LIBRARY_DIR)/*.m) \
+		$(wildcard $(MDBCOMP_DIR)/*.m)
 	$(MTAGS) $(MTAGSFLAGS) *.m $(LIBRARY_DIR)/*.m $(MDBCOMP_DIR)/*.m
 	touch .compiler_tags
 
Index: deep_profiler/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/deep_profiler/Mmakefile,v
retrieving revision 1.31
diff -u -b -r1.31 Mmakefile
--- deep_profiler/Mmakefile	22 Jun 2009 02:58:56 -0000	1.31
+++ deep_profiler/Mmakefile	17 Aug 2009 10:16:33 -0000
@@ -149,7 +149,9 @@
 	$(mdprof_feedback.ms) \
 	$(mdprof_procrep.ms)
 
-.deep_tags: $(MTAGS) $(DEEP_MS) $(MDBCOMP_DIR)/*.m $(LIBRARY_DIR)/*.m
+.deep_tags: $(MTAGS) $(DEEP_MS) \
+		$(wildcard $(MDBCOMP_DIR)/*.m) \
+		$(wildcard $(LIBRARY_DIR)/*.m)
 	$(MTAGS) $(DEEP_MS) $(MDBCOMP_DIR)/*.m $(LIBRARY_DIR)/*.m
 	touch .deep_tags
 
Index: slice/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/slice/Mmakefile,v
retrieving revision 1.18
diff -u -b -r1.18 Mmakefile
--- slice/Mmakefile	22 Jun 2009 02:58:56 -0000	1.18
+++ slice/Mmakefile	16 Jul 2009 03:36:57 -0000
@@ -128,7 +128,7 @@
 #-----------------------------------------------------------------------------#
 
 tags:	$(MTAGS) $(mslice.ms) $(mdice.ms) $(mtc_union.ms) $(mcov.ms) \
-		$(mtc_diff.ms) $(LIBRARY_DIR)/*.m
+		$(mtc_diff.ms) $(wildcard $(LIBRARY_DIR)/*.m)
 	$(MTAGS) $(mslice.ms) $(mdice.ms) $(mtc_union.ms) $(mcov.ms) \
 		$(mtc_diff.ms) $(LIBRARY_DIR)/*.m
 
--------------------------------------------------------------------------
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