[svn] Include ptimer.c in Windows builds.

diff --git a/ChangeLog b/ChangeLog
index ea435d140154811cc06356acd13e50aa885a0fa4..7a0e146d61125fe969b678a8d496f40fd8e38020 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * windows/Makefile.src: Compile ptimer.c and http-ntlm.c.
+
 2005-04-08  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * configure.in: Use it.

diff --git a/windows/Makefile.src b/windows/Makefile.src
index c4946eb0a1d7d05aa1e6bff1db6bd63bb9a56c37..14d9a7a8dec9133dacc7b857a102d44a41faa292 100644 (file)
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -32,8 +32,8 @@
 !ifndef NO_SSL
 SSLDEFS        = /DHAVE_SSL
 SSLLIBS        = libeay32.lib ssleay32.lib
-SSLSRC = gen_sslfunc.c
-SSLOBJ = gen_sslfunc$o
+SSLSRC = gen_sslfunc.c http-ntlm.c
+SSLOBJ = gen_sslfunc$o http-ntlm$o
 !endif
 
 o = .obj
@@ -71,13 +71,13 @@ LDFLAGS     = $(LDFLAGS) /ltcg:status
 SRC = cmpt.c safe-ctype.c convert.c connect.c host.c http.c netrc.c \
       ftp-basic.c ftp.c ftp-ls.c ftp-opie.c getopt.c hash.c \
       html-parse.c html-url.c progress.c retr.c recur.c res.c url.c cookies.c \
-      init.c utils.c main.c version.c xmalloc.c mswindows.c \
+      init.c utils.c main.c ptimer.c version.c xmalloc.c mswindows.c \
       gen-md5.c gnu-md5.c log.c $(SSLSRC)
 
 OBJ = cmpt$o safe-ctype$o convert$o connect$o host$o http$o netrc$o \
       ftp-basic$o ftp$o ftp-ls$o ftp-opie$o getopt$o hash$o \
       html-parse$o html-url$o progress$o retr$o recur$o res$o url$o cookies$o \
-      init$o utils$o main$o version$o xmalloc$o mswindows$o \
+      init$o utils$o main$o ptimer$o version$o xmalloc$o mswindows$o \
       gen-md5$o gnu-md5$o log$o $(SSLOBJ)
 
 .SUFFIXES: .c .obj

diff --git a/windows/Makefile.src.bor b/windows/Makefile.src.bor
index fc94660045c02ff5b21876b3912e9653eb01dfb0..715a62504d82e8064342bcf0f02c85e31d9f1d3b 100644 (file)
--- a/windows/Makefile.src.bor
+++ b/windows/Makefile.src.bor
@@ -13,7 +13,7 @@ CFLAGS=-DWINDOWS -DHAVE_CONFIG_H -I. -O2 -6 -d -q $(WARN)
 OBJS=cmpt.obj connect.obj convert.obj ftp.obj ftp-basic.obj  \
       ftp-ls.obj ftp-opie.obj getopt.obj host.obj html-parse.obj html-url.obj \
       http.obj init.obj log.obj main.obj gnu-md5.obj netrc.obj  \
-      safe-ctype.obj hash.obj progress.obj gen-md5.obj cookies.obj \
+      safe-ctype.obj hash.obj progress.obj ptimer.obj gen-md5.obj cookies.obj \
       recur.obj res.obj retr.obj url.obj utils.obj version.obj xmalloc.obj \
       mswindows.obj
 
@@ -45,6 +45,7 @@ main.obj+
 mswindows.obj+
 netrc.obj+
 progress.obj+
+ptimer.obj+
 recur.obj+
 res.obj+
 retr.obj+

diff --git a/windows/Makefile.src.mingw b/windows/Makefile.src.mingw
index 6526e826a7bb685196339de6300f9c2478a28a53..2d247ed2221972dced4a0ccc67e66cc42163ccca 100644 (file)
--- a/windows/Makefile.src.mingw
+++ b/windows/Makefile.src.mingw
@@ -25,7 +25,7 @@ OBJS=cmpt${OBJ_EXT} convert${OBJ_EXT} connect${OBJ_EXT} ftp${OBJ_EXT} ftp-basic$
       ftp-ls${OBJ_EXT} ftp-opie${OBJ_EXT} getopt${OBJ_EXT} host${OBJ_EXT} html-parse${OBJ_EXT} html-url${OBJ_EXT} \
       http${OBJ_EXT} init${OBJ_EXT} log${OBJ_EXT} main${OBJ_EXT} gnu-md5${OBJ_EXT} netrc${OBJ_EXT} \
       safe-ctype${OBJ_EXT} hash${OBJ_EXT} progress${OBJ_EXT} gen-md5${OBJ_EXT} cookies${OBJ_EXT} \
-      recur${OBJ_EXT} res${OBJ_EXT} retr${OBJ_EXT} url${OBJ_EXT} utils${OBJ_EXT} \
+      ptimer${OBJ_EXT} recur${OBJ_EXT} res${OBJ_EXT} retr${OBJ_EXT} url${OBJ_EXT} utils${OBJ_EXT} \
       version${OBJ_EXT} xmalloc${OBJ_EXT} mswindows${OBJ_EXT} 
 
 ifdef SSL
@@ -33,7 +33,7 @@ ifdef SSL
     OPENSSL_PATH = ../../openssl-0.9.7c
     CFLAGS += -I${OPENSSL_PATH}/outinc -DHAVE_SSL
     LIBS += -L${OPENSSL_PATH}/out -leay32 -lssl32
-    OBJS += gen_sslfunc${OBJ_EXT}
+    OBJS += gen_sslfunc${OBJ_EXT} http-ntlm${OBJ_EXT}
 endif
 
 all: wget.exe