diff options
| author | Priyesh Kumar <priyeshkkumar@gmail.com> | 2020-07-22 13:26:41 +0530 |
|---|---|---|
| committer | Priyesh Kumar <priyeshkkumar@gmail.com> | 2020-07-22 13:26:41 +0530 |
| commit | 117da1f7e6aad18ae647f0c52191847c8ce1c993 (patch) | |
| tree | 7889cc0a414fcf0c1e7f7dae47400f12616c16bd | |
| parent | 9bd35c7d916ee975b18fef6ddc0b65a6729609a2 (diff) | |
| download | freetype2-117da1f7e6aad18ae647f0c52191847c8ce1c993.tar.gz | |
Minor Changes in autogen.sh and builds/toplevel.mk
| -rw-r--r-- | [priyesh]ChangeLog | 5 | ||||
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | builds/toplevel.mk | 9 | ||||
| -rw-r--r-- | src/dlg/rules.mk | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/[priyesh]ChangeLog b/[priyesh]ChangeLog index b8519db8d..07217c434 100644 --- a/[priyesh]ChangeLog +++ b/[priyesh]ChangeLog @@ -1,5 +1,10 @@ 2020-07-22 Priyesh Kumar <priyeshkkumar@gmail.com> + * Changed `builds/toplevel.mk' and `autogen.sh' to copy dlg's include + files from `submodules/dlg' to `src/dlg/dlg' due to include path errors + on windows. + Updated `rules.mk' w.r.t to above changes. + * Updated `builds/toplevel.mk' so that for builds that do not use `./configure' script dlg files are copied from `submodules/dlg' to `src/dlg'. diff --git a/autogen.sh b/autogen.sh index f84c956f7..fdf3df74e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -165,8 +165,9 @@ chmod +x ./configure copy_submodule_files() { echo "Copying files from \`submodules/dlg' to \`src/dlg'" - cp $DLG_INC_DIR/dlg.h src/dlg - cp $DLG_INC_DIR/output.h src/dlg + mkdir src/dlg/dlg + cp $DLG_INC_DIR/dlg.h src/dlg/dlg + cp $DLG_INC_DIR/output.h src/dlg/dlg cp $DLG_SRC_DIR/* src/dlg } diff --git a/builds/toplevel.mk b/builds/toplevel.mk index b79f310db..f3c4ad98a 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -107,15 +107,16 @@ endif # from `submodule/dlg' to `src/dlg' # ifeq ($(wildcard src/dlg/dlg.*),) - ifeq ($(wildcard submodules/dlg/.*),) - $(info Submodule check out in `submodules/slg' ) + ifeq ($(wildcard submodules/dlg/dlg.*),) + $(info Submodule check out in `submodules/dlg' ) $(shell git submodule init) $(shell git submodule update) endif $(info Copying files from `submodules/dlg' to `src/dlg') - $(shell cp submodules/dlg/include/dlg/dlg.h src/dlg/) - $(shell cp submodules/dlg/include/dlg/output.h 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 diff --git a/src/dlg/rules.mk b/src/dlg/rules.mk index 67d5a893d..3c8f652a6 100644 --- a/src/dlg/rules.mk +++ b/src/dlg/rules.mk @@ -31,8 +31,8 @@ DLG_SRC := $(DLG_DIR)/dlg.c # dlg logging library headers # -DLG_H := $(DLG_SRC:%.c=%.h) \ - $(DLG_DIR)/output.h +DLG_H := $(DLG_DIR)/dlg/dlg.h \ + $(DLG_DIR)/dlg/output.h # dlg logging library object(s) |