summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2020-02-20 12:18:04 +0100
committerLukas Larsson <lukas@erlang.org>2020-02-24 09:53:15 +0100
commitd58966b9ff4990769d299325fe6208896316ddbd (patch)
treea2be22efe3e69183d00158a0f5e749e75d105643 /make
parent1cd2aacc52841cca4a95838ce68961176454d01a (diff)
downloaderlang-d58966b9ff4990769d299325fe6208896316ddbd.tar.gz
Generate hidden chunk files for any internal modules
Diffstat (limited to 'make')
-rw-r--r--make/doc.mk13
-rw-r--r--make/otp.mk.in3
2 files changed, 12 insertions, 4 deletions
diff --git a/make/doc.mk b/make/doc.mk
index 8dce91b49d..d45e07e795 100644
--- a/make/doc.mk
+++ b/make/doc.mk
@@ -28,7 +28,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
endif
RELCHUNKSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-APP_DIR = $(ERL_TOP)/lib/$(APPLICATION)/src
+APP_DIR = $(ERL_TOP)/lib/$(APPLICATION)
+APP_SRC_DIR = $(APP_DIR)/src
+APP_EBIN_DIR = $(APP_DIR)/src
# ----------------------------------------------------
HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
@@ -63,6 +65,9 @@ endif
CHUNK_REF3_FILES = $(filter-out $(NO_CHUNKS), $(XML_ALL_REF3_FILES))
CHUNK_FILES = $(CHUNK_REF3_FILES:%.xml=$(CHUNKSDIR)/%.chunk)
+ERL_CHUNK_FILES = $(patsubst $(APP_EBIN_DIR)/%.BEAM,$(CHUNKSDIR)/%.chunk,$(wildcard $(APP_EBIN_DIR)/*.beam))
+EMPTY_CHUNK_FILES = $(filter-out $(NO_CHUNKS:%.xml=$(CHUNKSDIR)/%.chunk) $(CHUNK_FILES), $(ERL_CHUNK_FILES))
+
# ----------------------------------------------------
# FLAGS
@@ -90,13 +95,13 @@ html: images $(HTML_REF_MAN_FILE)
man: $(MAN1_FILES) $(MAN2_FILES) $(MAN3_FILES) $(MAN4_FILES) $(MAN5_FILES) $(MAN6_FILES) $(MAN7_FILES)
-chunks: $(CHUNK_FILES)
+chunks: $(CHUNK_FILES) $(EMPTY_CHUNK_FILES)
images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
-$(EDOC_REF3_FILES:%=$(XMLDIR)/%): $(APP_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
+$(EDOC_REF3_FILES:%=$(XMLDIR)/%): $(APP_SRC_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript \
- -def vsn $(VSN) $(EDOC_FLAGS) -dir $(XMLDIR) $(APP_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
+ -def vsn $(VSN) $(EDOC_FLAGS) -dir $(XMLDIR) $(APP_SRC_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
$(XMLDIR)/$(EDOC_CHAPTER_FILE): ../overview.edoc
$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) \
-chapter -dir $(XMLDIR) $<
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 30fe0ee404..64061ac7b5 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -332,3 +332,6 @@ $(CHUNKSDIR)/%.chunk: $(XMLDIR)/%.xml ../../ebin/%.beam $(DOCGEN)/priv/bin/chunk
$(CHUNKSDIR)/%.chunk: $(XMLDIR)/%.xml ../../preloaded/ebin/%.beam $(DOCGEN)/priv/bin/chunk.escript
$(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $^ $@
+
+$(CHUNKSDIR)/%.chunk: ../../ebin/%.beam $(DOCGEN)/priv/bin/chunk.escript
+ $(gen_verbose)escript $(DOCGEN)/priv/bin/chunk.escript $^ $@