X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=msdos%2FMakefile.DJ;h=b37a4c28ce224bba41da06e6ed71ac8ab8d0cfc4;hp=bed35cd141a963dbf714f118afb1460bd9f2dcae;hb=320cfdcb658e8d6556ae9dfd902c2db1db866a6b;hpb=53d0aff795316dc1a4b785632f0d4d93c861e9cb

diff --git a/msdos/Makefile.DJ b/msdos/Makefile.DJ
index bed35cd1..b37a4c28 100644
--- a/msdos/Makefile.DJ
+++ b/msdos/Makefile.DJ
@@ -1,28 +1,40 @@
 #
 # GNU Makefile for wget / djgpp / MSDOS.
-# By Gisle Vanem <giva@bgnett.no>.
+# By Gisle Vanem <gvanem@broadpark.no> 2009.
 #
-.SUFFIXES: .exe .map
+# `cd' to `./src' and issue the command:
+#    make -f ../msdos/Makefile.dj depend
+#  followed by:
+#    make -f ../msdos/Makefile.dj
+#
+VERSION = 1.12 (djgpp/DOS)
+
+.SUFFIXES: .exe
+
+VPATH = ../lib ../md5 ../msdos
 
 USE_OPENSSL = 0
 USE_IPV6    = 1
 
+#
+# Change to suite.
+#
 OPENSSL_ROOT = e:/net/OpenSSL.099
 ZLIB_ROOT    = e:/djgpp/contrib/zlib
 
-VPATH   = ../src
 OBJ_DIR = djgpp.obj
 CC      = gcc
-CFLAGS  = -O2 -g -Wall -Wcast-align -I. -I../src -I/dev/env/WATT_ROOT/inc \
-          -DHAVE_CONFIG_H -DENABLE_DEBUG
+CFLAGS  = -O2 -g -Wall -Wcast-align -I. -I../msdos -I../lib -I../md5 \
+          -I/dev/env/WATT_ROOT/inc -DHAVE_CONFIG_H -DENABLE_DEBUG \
+          -DUSE_WATT32
 
 # LDFLAGS = -s
 
 ifeq ($(USE_OPENSSL),1)
-  CFLAGS  += -DHAVE_OPENSSL -DHAVE_SSL -I$(OPENSSL_ROOT)
+  CFLAGS  += -DHAVE_OPENSSL -DHAVE_SSL -DOPENSSL_NO_KRB5 -I$(OPENSSL_ROOT)
   EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a \
              $(ZLIB_ROOT)/libz.a
-  SOURCES  = ../src/openssl.c ../src/http-ntlm.c
+  SOURCES += openssl.c http-ntlm.c
 endif
 
 ifeq ($(USE_IPV6),1)
@@ -31,35 +43,46 @@ endif
 
 EX_LIBS += /dev/env/WATT_ROOT/lib/libwatt.a
 
-SOURCES += $(addprefix ../src/, 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)
+SOURCES += cmpt.c connect.c cookies.c exits.c ftp.c ftp-basic.c ftp-ls.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 \
+           ptimer.c spider.c css.c css-url.c build_info.c ../md5/md5.c \
+           ../msdos/msdos.c \
+           $(addprefix ../lib/, error.c exitfail.c quote.c \
+             quotearg.c getopt.c getopt1.c xalloc-die.c xmalloc.c)
 
 OBJECTS = $(addprefix $(OBJ_DIR)/, $(notdir $(SOURCES:.c=.o)))
 
-all: $(OBJ_DIR) ../wget-dos.exe
+all: $(OBJ_DIR) wget.exe
 	@echo 'Welcome to Wget'
 
 $(OBJ_DIR):
 	mkdir $(OBJ_DIR)
 
-../wget-dos.exe: $(OBJECTS)
+wget.exe: $(OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(EX_LIBS)
 
+css.c: css.l
+	flex -8 -o$@ $^
+
 clean:
-	rm -f $(OBJECTS) $(MAPFILE)
+	rm -f $(OBJ_DIR)/*.o $(MAPFILE)
 
 vclean realclean: clean
-	rm -f ../wget-dos.exe depend.dj
+	rm -f wget.exe depend.dj version.c
 	- rmdir $(OBJ_DIR)
 
 $(OBJ_DIR)/%.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 	@echo
 
-depend:
+version.c: ../msdos/Makefile.DJ
+	@echo 'char *version_string     = "$(VERSION)";' > $@
+	@echo 'char *compilation_string = "$(CC) $(CFLAGS)";' >> $@
+	@echo 'char *link_string        = "$(CC) $(LDFLAGS) -o wget.exe $$(OBJECTS) $(EX_LIBS)";' >> $@
+
+depend: version.c
 	$(CC) -MM $(CFLAGS) $(SOURCES) | \
         sed -e 's/^\([a-zA-Z0-9_-]*\.o:\)/$$(OBJ_DIR)\/\1/' > depend.dj