Gisle's diff-7.txt.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 63539b74971a475837da080db2e7f6d067267416..1036c296c518c895841f2078c4b9a6d408932935 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-15  Gisle Vanem  <gvanem@broadpark.no>
+
+       * config.h: Added some HAVE_* for djgpp 2.04 and Watcom 1.7+.
+
+       * Makefile.DJ: rewritten for including some files from ../lib.
+
+       * Makefile.WC: Ditto. Handling source-files out-of current
+       directory makes compliation a bit more painfull. AFAICS, one
+       must use explicit rules.
+
 2007-10-02  Gisle Vanem  <gvanem@broadpark.no>
 
        * config.h: Removed unused defines, added needed 'HAVE_*' defines.

diff --git a/msdos/Makefile.DJ b/msdos/Makefile.DJ
index 72e1cedf315619d1d548ab0e3b7be60386ec97a4..9b25ae529fd08d2a99b0ae5b656a6a884683527f 100644 (file)
--- a/msdos/Makefile.DJ
+++ b/msdos/Makefile.DJ
@@ -7,6 +7,8 @@
 #
 .SUFFIXES: .exe
 
+VPATH = ../lib
+
 USE_OPENSSL = 0
 USE_IPV6    = 1
 
@@ -18,7 +20,7 @@ ZLIB_ROOT    = e:/djgpp/contrib/zlib
 
 OBJ_DIR = djgpp.obj
 CC      = gcc
-CFLAGS  = -O2 -g -Wall -Wcast-align -I. -I../msdos -I/dev/env/WATT_ROOT/inc \
+CFLAGS  = -O2 -g -Wall -Wcast-align -I. -I../msdos -I../lib -I/dev/env/WATT_ROOT/inc \
           -DHAVE_CONFIG_H -DENABLE_DEBUG
 
 # LDFLAGS = -s
@@ -37,12 +39,12 @@ endif
 EX_LIBS += /dev/env/WATT_ROOT/lib/libwatt.a
 
 SOURCES += cmpt.c connect.c cookies.c ftp.c ftp-basic.c ftp-ls.c \
-           ftp-opie.c getopt.c hash.c host.c html-parse.c html-url.c \
-           http.c init.c log.c main.c gen-md5.c gnu-md5.c netrc.c \
-           progress.c recur.c res.c retr.c safe-ctype.c url.c utils.c \
-           version.c convert.c xmalloc.c ptimer.c spider.c
+           ftp-opie.c hash.c host.c html-parse.c html-url.c http.c \
+           init.c log.c main.c gen-md5.c netrc.c progress.c recur.c \
+           res.c retr.c snprintf.c url.c utils.c version.c convert.c xmalloc.c \
+           ptimer.c spider.c ../lib/getopt.c ../lib/getopt1.c ../lib/md5.c
 
-OBJECTS = $(addprefix $(OBJ_DIR)/, $(SOURCES:.c=.o))
+OBJECTS = $(addprefix $(OBJ_DIR)/, $(notdir $(SOURCES:.c=.o)))
 
 all: $(OBJ_DIR) wget.exe
        @echo 'Welcome to Wget'
@@ -54,7 +56,7 @@ wget.exe: $(OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $^ $(EX_LIBS)
 
 clean:
-       rm -f $(OBJECTS) $(MAPFILE)
+       rm -f $(OBJ_DIR)/*.o $(MAPFILE)
 
 vclean realclean: clean
        rm -f wget.exe depend.dj

diff --git a/msdos/Makefile.WC b/msdos/Makefile.WC
index de01b8fd10b1ec069c74449829bc377df5f47c7b..d20988ce9584d2eb431c4cd715fff149b72a741f 100644 (file)
--- a/msdos/Makefile.WC
+++ b/msdos/Makefile.WC
@@ -4,8 +4,8 @@
 #
 
 COMPILE = *wcc386 -mf -3r -w6 -d2 -zq -zm -of -I. -I$(%watt_root)\inc &
-            -I..\msdos -fr=nul -bt=dos -s -dHAVE_CONFIG_H -dENABLE_DEBUG &
-            -dSIZEOF_INT=4
+            -I..\msdos -I..\lib -fr=nul -bt=dos -s -dHAVE_CONFIG_H &
+            -dENABLE_DEBUG -dSIZEOF_INT=4
 
 LINK = *wlink option quiet, map, verbose, eliminate, caseexact, stack=100k &
         debug all system dos32a
@@ -14,20 +14,20 @@ OBJ_DIR = Watcom.obj
 
 OBJECTS = $(OBJ_DIR)\cmpt.obj      $(OBJ_DIR)\connect.obj    &
           $(OBJ_DIR)\convert.obj   $(OBJ_DIR)\cookies.obj    &
-          $(OBJ_DIR)\ftp-basic.obj $(OBJ_DIR)\ftp-ls.obj     &
-          $(OBJ_DIR)\ftp-opie.obj  $(OBJ_DIR)\ftp.obj        &
-          $(OBJ_DIR)\gen-md5.obj   $(OBJ_DIR)\getopt.obj     &
-          $(OBJ_DIR)\gnu-md5.obj   $(OBJ_DIR)\hash.obj       &
-          $(OBJ_DIR)\host.obj      $(OBJ_DIR)\html-parse.obj &
-          $(OBJ_DIR)\html-url.obj  $(OBJ_DIR)\http.obj       &
-          $(OBJ_DIR)\init.obj      $(OBJ_DIR)\log.obj        &
-          $(OBJ_DIR)\main.obj      $(OBJ_DIR)\netrc.obj      &
+          $(OBJ_DIR)\c-ctype.obj    $(OBJ_DIR)\ftp-basic.obj &
+          $(OBJ_DIR)\ftp-ls.obj     $(OBJ_DIR)\ftp-opie.obj  &
+          $(OBJ_DIR)\ftp.obj        $(OBJ_DIR)\gen-md5.obj   &
+          $(OBJ_DIR)\getopt.obj     $(OBJ_DIR)\getopt1.obj   &
+          $(OBJ_DIR)\hash.obj       $(OBJ_DIR)\host.obj      &
+          $(OBJ_DIR)\html-parse.obj $(OBJ_DIR)\html-url.obj  &
+          $(OBJ_DIR)\http.obj       $(OBJ_DIR)\init.obj      &
+          $(OBJ_DIR)\log.obj        $(OBJ_DIR)\main.obj      &
+          $(OBJ_DIR)\md5.obj        $(OBJ_DIR)\netrc.obj     &
           $(OBJ_DIR)\progress.obj  $(OBJ_DIR)\ptimer.obj     &
           $(OBJ_DIR)\recur.obj     $(OBJ_DIR)\res.obj        &
-          $(OBJ_DIR)\retr.obj      $(OBJ_DIR)\safe-ctype.obj &
-          $(OBJ_DIR)\spider.obj    $(OBJ_DIR)\url.obj        &
-          $(OBJ_DIR)\utils.obj     $(OBJ_DIR)\version.obj    &
-          $(OBJ_DIR)\xmalloc.obj
+          $(OBJ_DIR)\retr.obj       $(OBJ_DIR)\spider.obj    &
+          $(OBJ_DIR)\url.obj        $(OBJ_DIR)\utils.obj     &
+          $(OBJ_DIR)\version.obj    $(OBJ_DIR)\xmalloc.obj
 
 all: $(OBJ_DIR) wget.exe .SYMBOLIC
        @echo 'Welcome to Wget / Watcom'
@@ -36,8 +36,24 @@ $(OBJ_DIR):
        - mkdir $^@
 
 .ERASE
-.c{$(OBJ_DIR)}.obj:
-       *$(COMPILE) $[@ -fo=$@
+.c{$(OBJ_DIR)}.obj: .AUTODEPEND
+       *$(COMPILE) -fo=$@ $[@
+
+.ERASE
+$(OBJ_DIR)\c-ctype.obj: ..\lib\c-ctype.c
+       *$(COMPILE) -fo=$@ $[@
+
+.ERASE
+$(OBJ_DIR)\md5.obj: ..\lib\md5.c
+       *$(COMPILE) -fo=$@ $[@
+
+.ERASE
+$(OBJ_DIR)\getopt.obj: ..\lib\getopt.c
+       *$(COMPILE) -d_UNISTD_H_INCLUDED -fo=$@ $[@
+
+.ERASE
+$(OBJ_DIR)\getopt1.obj: ..\lib\getopt1.c
+       *$(COMPILE) -d_UNISTD_H_INCLUDED -fo=$@ $[@
 
 wget.exe: $(OBJECTS)
       $(LINK) name $@ file { $(OBJECTS) } library $(%watt_root)\lib\wattcpwf.lib

diff --git a/msdos/config.h b/msdos/config.h
index 276f66c1716ea14be5a4c4445edf004c0f35c82c..f40eb45cb80b30fea5cb155cd9ef3b1bbef52a1d 100644 (file)
--- a/msdos/config.h
+++ b/msdos/config.h
@@ -41,8 +41,13 @@
 
 #include <sys/errno.h>
 
-#if defined(__WATCOMC__) && (__WATCOMC__ >= 1250)  /* OW 1.5+ */
+#if defined(__WATCOMC__)
+  #if (__WATCOMC__ >= 1250)  /* OW 1.5+ */
   #define OPENWATCOM_15
+  #endif
+  #if (__WATCOMC__ >= 1270)  /* OW 1.7+ */
+    #define OPENWATCOM_17
+  #endif
 #endif
 
 #if defined(__HIGHC__)
@@ -71,7 +76,8 @@
   #define HAVE_INT64_T        1
 
   #if (DJGPP_MINOR >= 4)
-    #include <stdbool.h>
+    #define HAVE_STDBOOL_H 1
+    #define HAVE_STDINT_H  1
     #define HAVE_SNPRINTF 1
     #define HAVE_VSNPRINTF 1
     #define HAVE_UINT32_T 1
@@ -85,11 +91,18 @@
 
 #ifdef OPENWATCOM_15
   #define HAVE_INT64_T     1
+  #define HAVE_SNPRINTF    1
   #define HAVE_STRCASECMP  1
   #define HAVE_STRNCASECMP 1
+  #define HAVE_STDINT_H    1
   #define HAVE_UTIME_H     1
 #endif
 
+#ifdef OPENWATCOM_17
+  #define HAVE__BOOL       1
+  #define HAVE_STDBOOL_H   1
+#endif
+
 #define HAVE_PROCESS_H     1
 #define HAVE_STRDUP 1
 #define HAVE_STDLIB_H 1