forked from minhngoc25a/freetype2
* 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.
This commit is contained in:
parent
c3a0b43ec6
commit
635d394fe3
|
@ -1,3 +1,12 @@
|
||||||
|
2021-02-16 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* 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 <wl@gnu.org>
|
2021-02-16 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* builds/toplevel.mk: Use rules for handling 'dlg'.
|
* builds/toplevel.mk: Use rules for handling 'dlg'.
|
||||||
|
|
|
@ -104,21 +104,6 @@ ifneq ($(findstring setup,$(MAKECMDGOALS)),)
|
||||||
endif
|
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
|
# Include the automatic host platform detection rules when we need to
|
||||||
# check the platform.
|
# check the platform.
|
||||||
#
|
#
|
||||||
|
@ -131,8 +116,8 @@ ifdef check_platform
|
||||||
# For builds directly from the git repository we need to copy files
|
# For builds directly from the git repository we need to copy files
|
||||||
# from `subprojects/dlg' to `src/dlg' and `include/dlg'.
|
# from `subprojects/dlg' to `src/dlg' and `include/dlg'.
|
||||||
#
|
#
|
||||||
ifeq ($(wildcard src/dlg/dlg.*),)
|
ifeq ($(wildcard $(TOP_DIR)/src/dlg/dlg.*),)
|
||||||
ifeq ($(wildcard subprojects/dlg/*),)
|
ifeq ($(wildcard $(TOP_DIR)/subprojects/dlg/*),)
|
||||||
copy_submodule: check_out_submodule
|
copy_submodule: check_out_submodule
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -181,6 +166,23 @@ else
|
||||||
endif # test check_platform
|
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.
|
# We always need the list of modules in ftmodule.h.
|
||||||
#
|
#
|
||||||
all setup: $(FTMODULE_H)
|
all setup: $(FTMODULE_H)
|
||||||
|
|
Loading…
Reference in New Issue