moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Fix some build issues

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-05-15 22:58:57 +02:00
parent baa0ec7f31
commit ffbba2e6b9
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2010-05-15 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am: Quote any path using $(top_srcdir) or $(top_builddir).
(version.c): Remove dependency from configure.ac and Makefile.am.
* css.l: Include "wget.h".
2010-05-08 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am: Update copyright years.

13
src/Makefile.am
View File

@ -65,19 +65,18 @@ MD5_LDADD = @MD5_LDADD@
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
build_info.c: $(srcdir)/Makefile.am $(srcdir)/build_info.c.in
if test -n "$(VPATH)"; then cp $(srcdir)/build_info.c.in .; fi
$(PERL) $(top_srcdir)/build-aux/build_info.pl \
$(abs_builddir)/build_info.c
if test -n "$(VPATH)"; then cp "$(srcdir)/build_info.c.in" .; fi
$(PERL) "$(top_srcdir)/build-aux/build_info.pl" \
"$(abs_builddir)/build_info.c"
if test -n "$(VPATH)"; then rm -f build_info.c.in; fi
ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
version.c: $(wget_SOURCES) ../lib/libgnu.a $(MD5_LDADD) \
$(srcdir)/Makefile.am $(top_srcdir)/configure.ac
version.c: $(wget_SOURCES) ../lib/libgnu.a $(MD5_LDADD)
echo '/* version.c */' > $@
echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
echo '' >> $@
echo 'const char *version_string = "@VERSION@"' >> $@
-hg log -R $(top_srcdir) -r . --template='" ({node|short})"\n' \
-hg log -R "$(top_srcdir)" -r . --template='" ({node|short})"\n' \
2>/dev/null >> $@
echo ';' >> $@
echo 'const char *compilation_string = "'$(COMPILE)'";' \
@ -89,7 +88,7 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a $(MD5_LDADD) \
check_LIBRARIES = libunittest.a
libunittest_a_SOURCES = $(wget_SOURCES) test.c build_info.c test.h
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)
EXTRA_DIST = build_info.c.in

1
src/css.l
View File

@ -33,6 +33,7 @@ Corresponding Source for a non-source form of such a combination
shall include the source code for the parts of OpenSSL used as well
as that of the covered work. */
#include "wget.h"
#include "css-tokens.h"
/* {s}+\/\*[^*]*\*+([^/*][^*]*\*+)*\/ {unput(' '); } */