[svn] Added basic support for unit testing

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index bcf2ec099870fa8373c79a073dfd34698ad3748f..22c03d2a4fcdebceeb98b4d0534edb84077156e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
-LIBS = @LIBS@
+LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@
 LDFLAGS = @LDFLAGS@
 
 #
@@ -66,7 +66,6 @@ LDFLAGS = @LDFLAGS@
 #
 
 DISTNAME = wget-@VERSION@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
 RM = rm -f
 
 # These are used for maintenance only, so they are safe without
@@ -81,12 +80,20 @@ CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
 prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
 infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 
+TESTDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS) -DTESTING' DEFS='$(DEFS)' \
+CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
+prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
+infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
+
 # subdirectories in the distribution
 SUBDIRS = src doc po util windows
 
 # default target
-all: libtool src/config.h Makefile $(SUBDIRS)
+all: src/config.h Makefile $(SUBDIRS)
 
+test: src/config.h Makefile 
+       cd src && $(MAKE) $(TESTDEFS) clean && $(MAKE) $(TESTDEFS) test$(exeext)
+       
 check: all
 
 $(SUBDIRS): FORCE
@@ -108,21 +115,11 @@ install.info uninstall.info install.man uninstall.man install.wgetrc:
 install.mo:
        cd po && $(MAKE) $(MAKEDEFS) $@
 
-# Regenerate libtool if ltconfig and/or ltmain are updated
-libtool: $(LIBTOOL_DEPS)
-       $(SHELL) ./config.status --recheck
-
-# Create configure.bat from configure.bat.in by DOS-ifying the lines.
-# This is invoked by `make dist' and deleted by `make realclean' (not
-# `make distclean' because we want to preserve it for distribution).
-configure.bat: $(srcdir)/configure.bat.in
-       awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $< > $@
-
 # create tag files for Emacs
 TAGS:
        cd src && $(MAKE) $@
 
-dist: $(srcdir)/configure $(srcdir)/configure.bat DISTFILES
+dist: $(srcdir)/configure DISTFILES
        mkdir $(DISTNAME)
        for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
                if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
@@ -141,10 +138,7 @@ dist: $(srcdir)/configure $(srcdir)/configure.bat DISTFILES
 DISTFILES: FORCE
        rm -rf $(DISTNAME)      
        (cd $(srcdir); find . ! -type d -print) \
-       | sed '/\/\(CVS\|RCS\)\//d; \
-               /$@/d; \
-               /\.tar.*/d; \
-               s/^.\///; /^\.$$/d;' \
+       | sed '/\/\(CVS\|RCS\)\//d; /$@/d; /\.tar.*/d; s/^.\///; /^\.$$/d;' \
        | sort | uniq > $@
 
 #
@@ -157,14 +151,13 @@ realclean:        realclean-recursive     realclean-top
 
 clean-top:
        $(RM) *~ *.bak $(DISTNAME).tar.gz
-       $(RM) -r .libs
 
 distclean-top: clean-top
        $(RM) Makefile config.status config.log config.cache libtool stamp-h
        $(RM) -r autom4te.cache
 
 realclean-top: distclean-top
-       $(RM) configure configure.bat
+       $(RM) configure
 
 clean-recursive distclean-recursive realclean-recursive:
        for subdir in $(SUBDIRS); do \
@@ -176,13 +169,13 @@ clean-recursive distclean-recursive realclean-recursive:
 # Dependencies for maintenance
 #
 
-$(srcdir)/configure: configure.in aclocal.m4
+$(srcdir)/configure: configure.in
        cd $(srcdir) && autoconf
 
 # autoheader might not change config.h.in, so touch a stamp file.
 $(srcdir)/src/config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.in aclocal.m4
-       true; # running autoheader here breaks: cd $(srcdir) && autoheader
+$(srcdir)/stamp-h.in: configure.in
+       @true; # running autoheader here breaks: cd $(srcdir) && autoheader
        echo timestamp > $(srcdir)/stamp-h.in
 
 src/config.h: stamp-h