diff options
| author | Werner Lemberg <wl@gnu.org> | 2021-02-16 14:07:18 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2021-02-16 14:07:18 +0100 |
| commit | 92bd99bd25e93baeff742444dee129629f70e5c8 (patch) | |
| tree | f341997072b687f28fccc13f2421ab8ef5316ebb /builds/toplevel.mk | |
| parent | 215ae253304d610b90778d438abc1d019699ebd8 (diff) | |
| download | freetype2-92bd99bd25e93baeff742444dee129629f70e5c8.tar.gz | |
Move 'dlg' submodule to `subprojects` directory.
This is for future changes with Meson, which doesn't allow a
different name for its `subprojects` directory. Having both a
`submodules` and a `subprojects` directory is confusing.
* .gitmodules, autogen.sh (copy_submodule_files, DLG_INC_DIR,
DLG_SRC_DIR): Updated.
* builds/toplevel.mk (<top-level>, do-dist),
builds/windows/vc2010/script.bat: Updated.
* src/tools/no-copyright: Updated.
Diffstat (limited to 'builds/toplevel.mk')
| -rw-r--r-- | builds/toplevel.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/builds/toplevel.mk b/builds/toplevel.mk index b17dce9b6..08170bbef 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -113,23 +113,23 @@ 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' and `include/dlg'. + # from `subprojects/dlg' to `src/dlg' and `include/dlg'. # ifeq ($(wildcard src/dlg/dlg.*),) - ifeq ($(wildcard submodules/dlg/*),) - $(info Checking out submodule in `submodules/dlg') + ifeq ($(wildcard subprojects/dlg/*),) + $(info Checking out submodule in `subprojects/dlg') $(shell git submodule init) $(shell git submodule update) endif - $(info Copying files from `submodules/dlg' to `src/dlg' and `include/dlg') + $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg') $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)) $(shell $(COPY) \ - $(subst /,$(SEP),submodules/dlg/include/dlg/output.h include/dlg)) + $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)) $(shell $(COPY) \ - $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h include/dlg)) + $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)) $(shell $(COPY) \ - $(subst /,$(SEP),submodules/dlg/src/dlg/dlg.c src/dlg)) + $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)) endif # This rule makes sense for Unix only to remove files created by a run of @@ -292,6 +292,6 @@ do-dist: distclean refdoc rm -f docs/mkdocs.yml @# Remove more stuff related to git. - rm -rf submodules + rm -rf subprojects # EOF |