--- a/mercurial/monticello/Make.proto Wed Jun 03 08:32:13 2015 +0100
+++ b/mercurial/monticello/Make.proto Thu Jun 11 07:56:26 2015 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/monticello
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/monticello -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libscm/mercurial
# if you need any additional defines for embedded C code,
@@ -82,7 +82,7 @@
# run default testsuite for this package
test: $(TOP)/goodies/builder/reports
- $(MAKE) -C $(TOP)/goodies/builder/reports
+ $(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
@@ -118,7 +118,7 @@
# build all packages containing referenced classes for this package
-# they are nor needed to compile the package
+# they are not needed to compile the package (but later, to load it)
references:
@@ -133,10 +133,8 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)/stx/goodies/monticello/MCLazyVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCAncestry.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)/stx/goodies/monticello/MCLazyVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCAncestry.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)/stx/goodies/monticello/MCAncestry.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCLazyVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCVersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line