[m-rev.] diff: always build deep_profiler directory

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

Always compile the programs in the deep_profiler directory.  Given the
increased dependence of this code on the mdbcomp directory it is sensible to
always compile the code, not just when the deep profiler is enabled.

Installation of the deep profiler is still conditional on the existence of
the CGI lib directory etc.

Mmakefile:
deep_profiler/Mmakefile:
 	Always build the dependencies and compile the deep_profiler directory.

Julien.

Index: Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.128
diff -u -r1.128 Mmakefile
--- Mmakefile	24 Oct 2007 09:21:13 -0000	1.128
+++ Mmakefile	2 Nov 2007 12:56:22 -0000
@@ -154,20 +154,17 @@
  		library/$(deps_subdir)$(STD_LIB_NAME).dep
  	+cd profiler && $(SUBDIR_MMAKE) depend

-.PHONY: dep_deep_profiler
-ifeq ("$(ENABLE_DEEP_PROFILER)","yes")
  dep_deep_profiler: deep_profiler/$(deps_subdir)mdprof_cgi.dep \
  		deep_profiler/$(deps_subdir)mdprof_test.dep \
  		deep_profiler/$(deps_subdir)mdprof_dump.dep \
-		deep_profiler/$(deps_subdir)mdprof_feedback.dep
-else
-dep_deep_profiler:
-endif
+		deep_profiler/$(deps_subdir)mdprof_feedback.dep \
+		deep_profiler/$(dpes_subdir)mdprof_procrep.dep

  deep_profiler/$(deps_subdir)mdprof_cgi.dep \
  deep_profiler/$(deps_subdir)mdprof_test.dep \
  deep_profiler/$(deps_subdir)mdprof_dump.dep \
-deep_profiler/$(deps_subdir)mdprof_feedback.dep: \
+deep_profiler/$(deps_subdir)mdprof_feedback.dep \
+deep_profiler/$(dpes_subdir)mdprof_proc_rep.dep: \
  		library/$(deps_subdir)$(STD_LIB_NAME).dep
  	+cd deep_profiler && $(SUBDIR_MMAKE) depend

Index: deep_profiler/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/deep_profiler/Mmakefile,v
retrieving revision 1.24
diff -u -r1.24 Mmakefile
--- deep_profiler/Mmakefile	24 Sep 2007 13:26:58 -0000	1.24
+++ deep_profiler/Mmakefile	2 Nov 2007 12:56:22 -0000
@@ -41,19 +41,15 @@
  	mdprof_feedback \
  	mdprof_procrep

+# Always compile the deep profiler, even if it is not enabled.
+# 
+MAIN_TARGET=all
+MERCURY_MAIN_MODULES=$(ALL_DEEP_MODULES)
+DEPEND=$(patsubst %,%.depend,$(ALL_DEEP_MODULES))
+
  ifeq ("$(ENABLE_DEEP_PROFILER)","yes")
-	MAIN_TARGET=all
-	MERCURY_MAIN_MODULES=$(ALL_DEEP_MODULES)
-	DEPEND=$(patsubst %,%.depend,$(ALL_DEEP_MODULES))
  	INSTALL=install_cgi_progs
  else
-	MAIN_TARGET=nothing
-	MERCURY_MAIN_MODULES=
-	# When building the source .tar.gz distribution, we need to
-	# include the generated .c files for the deep profiler,
-	# even if deep profiling wasn't enabled on this host.
-	# That implies that we need to make the dependencies.
-	DEPEND=$(patsubst %,%.depend,$(ALL_DEEP_MODULES))
  	INSTALL=nothing
  endif


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------