github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-31 23:00:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a build error detected MacOS and NetBSD.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-08-18 14:00:57 +02:00
parent 1c76d3cceb
commit c79ff7f47a
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-18 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am: Use an additional file "css_.c" which in turn includes
"wget.h" and immediately "css.c".
2011-08-18 Giuseppe Scrivano <giuseppe@southpole.se> 2011-08-18 Giuseppe Scrivano <giuseppe@southpole.se>
* http.c (gethttp): Reset chunked_transfer_encoding on redirections. * http.c (gethttp): Reset chunked_transfer_encoding on redirections.

16
src/Makefile.am
View File

@ -39,9 +39,11 @@ endif
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME)
EXTRA_DIST = css.l css.c css_.c build_info.c.in
bin_PROGRAMS = wget bin_PROGRAMS = wget
wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \ wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \
css.l css-url.c \ css_.c css-url.c \
ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \ ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
http.c init.c log.c main.c netrc.c progress.c ptimer.c \ http.c init.c log.c main.c netrc.c progress.c ptimer.c \
recur.c res.c retr.c spider.c url.c \ recur.c res.c retr.c spider.c url.c \
@ -57,6 +59,7 @@ EXTRA_wget_SOURCES = iri.c
LDADD = $(LIBOBJS) ../lib/libgnu.a LDADD = $(LIBOBJS) ../lib/libgnu.a
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
../lib/libgnu.a: ../lib/libgnu.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS) cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
@ -78,11 +81,20 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a
$(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \
| $(ESCAPEQUOTE) >> $@ | $(ESCAPEQUOTE) >> $@
css.c: $(srcdir)/css.l
$(LEX) $(LFLAGS) -o $@ $^
css_.c: css.c
echo '#include "wget.h"' > $@
cat css.c >> $@
distclean-local:
rm -f css.c css_.c
check_LIBRARIES = libunittest.a check_LIBRARIES = libunittest.a
libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h
nodist_libunittest_a_SOURCES = version.c nodist_libunittest_a_SOURCES = version.c
libunittest_a_CPPFLAGS = -DTESTING "-I$(top_builddir)/lib" "-I$(top_srcdir)/lib" libunittest_a_CPPFLAGS = -DTESTING "-I$(top_builddir)/lib" "-I$(top_srcdir)/lib"
libunittest_a_LIBADD = $(LIBOBJS) libunittest_a_LIBADD = $(LIBOBJS)
EXTRA_DIST = build_info.c.in
CLEANFILES = *~ *.bak core core.[0-9]* build_info.c version.c CLEANFILES = *~ *.bak core core.[0-9]* build_info.c version.c