ref: 635d394fe3c040c68753b757101439d1b1368002
parent: c3a0b43ec62fcee6914c84911e87e043e199a500
author: Werner Lemberg <[email protected]>
date: Tue Feb 16 14:24:15 EST 2021
* builds/toplevel.mk: Fix previous commit. <top_level>: Use `TOP_DIR` in `wildcard` function. (check_out_submodule, copy_submodule): Move down to come after definition of `all` rule. Call `mkdir` conditionally.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2021-02-16 Werner Lemberg <[email protected]>
+ * builds/toplevel.mk: Fix previous commit.
+
+ <top_level>: Use `TOP_DIR` in `wildcard` function.
+ (check_out_submodule, copy_submodule): Move down to come after
+ definition of `all` rule.
+ Call `mkdir` conditionally.
+
+2021-02-16 Werner Lemberg <[email protected]>
+
* builds/toplevel.mk: Use rules for handling 'dlg'.
Suggested by Alexei.
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -104,21 +104,6 @@
endif
-.PHONY: check_out_submodule copy_out_submodule
-
-check_out_submodule:
- $(info Checking out submodule in `subprojects/dlg')
- git submodule init
- git submodule update
-
-copy_submodule:
- $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
- mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)
- $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
- $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
- $(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
-
-
# Include the automatic host platform detection rules when we need to
# check the platform.
#
@@ -131,8 +116,8 @@
# For builds directly from the git repository we need to copy files
# from `subprojects/dlg' to `src/dlg' and `include/dlg'.
#
- ifeq ($(wildcard src/dlg/dlg.*),)
- ifeq ($(wildcard subprojects/dlg/*),)
+ ifeq ($(wildcard $(TOP_DIR)/src/dlg/dlg.*),)
+ ifeq ($(wildcard $(TOP_DIR)/subprojects/dlg/*),)
copy_submodule: check_out_submodule
endif
@@ -179,6 +164,23 @@
include $(CONFIG_MK)
endif # test check_platform
+
+
+.PHONY: check_out_submodule copy_submodule
+
+check_out_submodule:
+ $(info Checking out submodule in `subprojects/dlg')
+ git submodule init
+ git submodule update
+
+copy_submodule:
+ $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
+ ifeq ($(wildcard include/dlg),)
+ mkdir $(subst /,$(SEP),include/dlg)
+ endif
+ $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
+ $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
+ $(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
# We always need the list of modules in ftmodule.h.