diff options
| author | Werner Lemberg <wl@gnu.org> | 2020-12-02 07:08:24 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-12-05 09:43:45 +0100 |
| commit | f6b0fd7b792933fb601470bf70f2f4285712f449 (patch) | |
| tree | 038f8c9889c7fac694810bce0b8858ca6cf40fa1 /builds | |
| parent | fcdab61ed16f4c2f9b65a8e2ea3394ecb0d33944 (diff) | |
| download | freetype2-f6b0fd7b792933fb601470bf70f2f4285712f449.tar.gz | |
Improve setup for 'dlg' library.
* autogen.sh (copy_submodule_file), builds/toplevel.mk: Redirect
stderr to `/dev/null`.
* builds/toplevel.mk: Move code block to handle 'dlg' stuff into
`check_platform` conditional.
Also fix wildcard expressions for guarding `git submodule` commands.
Also make file copying work with non-Unix platforms (untested).
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/toplevel.mk | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/builds/toplevel.mk b/builds/toplevel.mk index c08c9f4e7..8379bebe3 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -103,23 +103,6 @@ ifneq ($(findstring setup,$(MAKECMDGOALS)),) check_platform := 1 endif -# For builds directly from the git repository we need to copy files -# from `submodule/dlg' to `src/dlg'. -# -ifeq ($(wildcard src/dlg/dlg.*),) - ifeq ($(wildcard submodules/dlg/dlg.*),) - $(info Checking out submodule in `submodules/dlg') - $(shell git submodule init) - $(shell git submodule update) - endif - - $(info Copying files from `submodules/dlg' to `src/dlg') - $(shell mkdir src/dlg/dlg) - $(shell cp submodules/dlg/include/dlg/dlg.h src/dlg/dlg) - $(shell cp submodules/dlg/include/dlg/output.h src/dlg/dlg) - $(shell cp submodules/dlg/src/dlg/dlg.c src/dlg/) -endif - # Include the automatic host platform detection rules when we need to # check the platform. # @@ -129,6 +112,26 @@ ifdef check_platform include $(TOP_DIR)/builds/detect.mk + # For builds directly from the git repository we need to copy files + # from `submodule/dlg' to `src/dlg'. + # + ifeq ($(wildcard src/dlg/dlg.*),) + ifeq ($(wildcard submodules/dlg/*),) + $(info Checking out submodule in `submodules/dlg') + $(shell git submodule init) + $(shell git submodule update) + endif + + $(info Copying files from `submodules/dlg' to `src/dlg') + $(shell mkdir $(subst /,$(SEP),src/dlg/dlg) $(NO_OUTPUT)) + $(shell $(COPY) \ + $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h src/dlg/dlg)) + $(shell $(COPY) \ + $(subst /,$(SEP),submodules/dlg/include/dlg/output.h src/dlg/dlg)) + $(shell $(COPY) \ + $(subst /,$(SEP),submodules/dlg/src/dlg/dlg.c src/dlg)) + endif + # This rule makes sense for Unix only to remove files created by a run of # the configure script which hasn't been successful (so that no # `config.mk' has been created). It uses the built-in $(RM) command of |