Fix some build issues

diff --git a/src/ChangeLog b/src/ChangeLog
index e29cc9142b656b376b5f6866ba2bae28898a5e5b..e6fd4a4516fce6ed4d32edaf441c7d4fb868c560 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/Makefile.am b/src/Makefile.am
index 49afcee4e8bc7b2e1a82d9c0f1aec0b8722027d7..45bbf8655ed8676f1cce7ec667a111991a81c144 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
 

diff --git a/src/css.l b/src/css.l
index be777de22506c18c9631bbc6235960f3d81a4614..3db668ce888720c815c9fc6d8129c8e28f8cf2fb 100644 (file)
--- a/src/css.l
+++ b/src/css.l
@@ -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(' '); } */