[Git][freetype/freetype][master] * builds/toplevel.mk: Fix previous commit.

[Werner Lemberg]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 635d394f
  by Werner Lemberg at 2021-02-16T19:24:15+01:00

  * 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.
  

2 changed files:

• ChangeLog
• builds/toplevel.mk

Changes:

ChangeLog

---

	1	+2021-02-16 Werner Lemberg <wl@gnu.org>
	2	+
	3	+ * builds/toplevel.mk: Fix previous commit.
	4	+
	5	+ <top_level>: Use `TOP_DIR` in `wildcard` function.
	6	+ (check_out_submodule, copy_submodule): Move down to come after
	7	+ definition of `all` rule.
	8	+ Call `mkdir` conditionally.
	9	+
1	10	2021-02-16 Werner Lemberg <wl@gnu.org>
2	11
3	12	* builds/toplevel.mk: Use rules for handling 'dlg'.

builds/toplevel.mk

---

...	...	@@ -104,21 +104,6 @@ ifneq ($(findstring setup,$(MAKECMDGOALS)),)
104	104	endif
105	105
106	106
107		-.PHONY: check_out_submodule copy_out_submodule
108		-
109		-check_out_submodule:
110		- $(info Checking out submodule in `subprojects/dlg')
111		- git submodule init
112		- git submodule update
113		-
114		-copy_submodule:
115		- $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
116		- mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)
117		- $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
118		- $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
119		- $(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
120		-
121		-
122	107	# Include the automatic host platform detection rules when we need to
123	108	# check the platform.
124	109	#
...	...	@@ -131,8 +116,8 @@ ifdef check_platform
131	116	# For builds directly from the git repository we need to copy files
132	117	# from `subprojects/dlg' to `src/dlg' and `include/dlg'.
133	118	#
134		- ifeq ($(wildcard src/dlg/dlg.*),)
135		- ifeq ($(wildcard subprojects/dlg/*),)
	119	+ ifeq ($(wildcard $(TOP_DIR)/src/dlg/dlg.*),)
	120	+ ifeq ($(wildcard $(TOP_DIR)/subprojects/dlg/*),)
136	121	copy_submodule: check_out_submodule
137	122	endif
138	123
...	...	@@ -181,6 +166,23 @@ else
181	166	endif # test check_platform
182	167
183	168
	169	+.PHONY: check_out_submodule copy_submodule
	170	+
	171	+check_out_submodule:
	172	+ $(info Checking out submodule in `subprojects/dlg')
	173	+ git submodule init
	174	+ git submodule update
	175	+
	176	+copy_submodule:
	177	+ $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
	178	+ ifeq ($(wildcard include/dlg),)
	179	+ mkdir $(subst /,$(SEP),include/dlg)
	180	+ endif
	181	+ $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
	182	+ $(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
	183	+ $(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
	184	+
	185	+
184	186	# We always need the list of modules in ftmodule.h.
185	187	#
186	188	all setup: $(FTMODULE_H)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.