[svn] Avoid code repetition between time_str and datetime_str.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 54acb2c1592ae2f7f20203a6092e1467779bf223..5c1b07bc27d0dc764f59765722cab6a62e999b27 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@ @LIBSSL@
+LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@
 LDFLAGS = @LDFLAGS@
 
 #
@@ -77,15 +77,19 @@ TAR = tar
 # flags passed to recursive makes in subdirectories
 MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
 CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
-prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
-infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
+DESTDIR='$(DESTDIR=)' prefix='$(prefix)' exec_prefix='$(exec_prefix)' \
+bindir='$(bindir)' infodir='$(infodir)' mandir='$(mandir)' \
+manext='$(manext)'
 
 # subdirectories in the distribution
-SUBDIRS = src doc po util windows
+SUBDIRS = src doc po tests util windows
 
 # default target
 all: src/config.h Makefile $(SUBDIRS)
 
+unittest: src/config.h Makefile 
+       cd tests && $(MAKE) $(MAKEDEFS) $@
+       
 check: all
 
 $(SUBDIRS): FORCE
@@ -130,10 +134,7 @@ dist: $(srcdir)/configure 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 > $@
 
 #
@@ -146,7 +147,6 @@ 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