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

[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'.

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
 }
 

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
 

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)