Variation on a theme of Makefile.docfiles

Makefile.common

@@ -27,8 +27,6 @@ MKDIR=mkdir -p
 EMPTY :=
 # $(SPACE) contains a single space
 SPACE := $(EMPTY) $(EMPTY)
-# $( ) allows line breaking with $\ at the end of the line
-$(SPACE) :=
 
 DESTDIR ?=
 INSTALL_BINDIR := $(DESTDIR)$(BINDIR)

api_docgen/Makefile

@@ -14,8 +14,8 @@
 #**************************************************************************
 ROOTDIR = ..
 
-include $(ROOTDIR)/Makefile.common
 include $(ROOTDIR)/stdlib/StdlibModules
+include $(ROOTDIR)/Makefile.common
 include $(ROOTDIR)/Makefile.best_binaries
 include $(ROOTDIR)/ocamldoc/Makefile.best_ocamldoc
 include Makefile.docfiles

manual/tests/Makefile

@@ -1,6 +1,5 @@
 TOPDIR=$(abspath ../..)
 SRC=$(TOPDIR)
-include $(TOPDIR)/Makefile.common
 include $(TOPDIR)/stdlib/StdlibModules
 include $(TOPDIR)/api_docgen/Makefile.docfiles
 include $(TOPDIR)/Makefile.tools

stdlib/StdlibModules

@@ -15,7 +15,7 @@
 #*                                                                        *
 #**************************************************************************
 
-# Makefile.common must be included before this Makefile
+# This file must be self-contained.
 
 # This file lists all standard library modules. It is used by:
 # 1. stdlib/Makefile when building stdlib.cma
@@ -47,12 +47,15 @@ STDLIB_MODULE_BASENAMES=\
 STDLIB_PREFIXED_MODULES=\
   $(filter-out stdlib camlinternal%, $(STDLIB_MODULE_BASENAMES))
 
+define add_stdlib_prefix_first
+$(shell echo $1 | cut -c1 | tr '[:lower:]' '[:upper:]')
+endef
+
 # add stdlib__ as prefix to a module except for internal modules
 # and the stdlib module itself
 define add_stdlib_prefix
   $(or $(filter-out $(STDLIB_PREFIXED_MODULES), $1), \
-    stdlib__$(shell echo $1 | cut -c1 | tr '[:lower:]' '[:upper:]')$\
-            $(shell echo $1 | cut -c2-))
+    stdlib__$(call add_stdlib_prefix_first,$1)$(shell echo $1 | cut -c2-))
 endef
 
 STDLIB_MODULES:=\