Minor Changes in autogen.sh and builds/toplevel.mk

This commit is contained in:
Priyesh Kumar 2020-07-22 13:26:41 +05:30
parent 9bd35c7d91
commit 117da1f7e6
4 changed files with 15 additions and 8 deletions

View File

@ -1,5 +1,10 @@
2020-07-22 Priyesh Kumar <priyeshkkumar@gmail.com> 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 * Updated `builds/toplevel.mk' so that for builds that do not use
`./configure' script dlg files are copied from `submodules/dlg' to `./configure' script dlg files are copied from `submodules/dlg' to
`src/dlg'. `src/dlg'.

View File

@ -165,8 +165,9 @@ chmod +x ./configure
copy_submodule_files() copy_submodule_files()
{ {
echo "Copying files from \`submodules/dlg' to \`src/dlg'" echo "Copying files from \`submodules/dlg' to \`src/dlg'"
cp $DLG_INC_DIR/dlg.h src/dlg mkdir src/dlg/dlg
cp $DLG_INC_DIR/output.h src/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 cp $DLG_SRC_DIR/* src/dlg
} }

View File

@ -107,15 +107,16 @@ endif
# from `submodule/dlg' to `src/dlg' # from `submodule/dlg' to `src/dlg'
# #
ifeq ($(wildcard src/dlg/dlg.*),) ifeq ($(wildcard src/dlg/dlg.*),)
ifeq ($(wildcard submodules/dlg/.*),) ifeq ($(wildcard submodules/dlg/dlg.*),)
$(info Submodule check out in `submodules/slg' ) $(info Submodule check out in `submodules/dlg' )
$(shell git submodule init) $(shell git submodule init)
$(shell git submodule update) $(shell git submodule update)
endif endif
$(info Copying files from `submodules/dlg' to `src/dlg') $(info Copying files from `submodules/dlg' to `src/dlg')
$(shell cp submodules/dlg/include/dlg/dlg.h src/dlg/) $(shell mkdir src/dlg/dlg)
$(shell cp submodules/dlg/include/dlg/output.h src/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/) $(shell cp submodules/dlg/src/dlg/dlg.c src/dlg/)
endif endif

View File

@ -31,8 +31,8 @@ DLG_SRC := $(DLG_DIR)/dlg.c
# dlg logging library headers # dlg logging library headers
# #
DLG_H := $(DLG_SRC:%.c=%.h) \ DLG_H := $(DLG_DIR)/dlg/dlg.h \
$(DLG_DIR)/output.h $(DLG_DIR)/dlg/output.h
# dlg logging library object(s) # dlg logging library object(s)