r5405 - in trunk/varnish-cache/lib: libvcl libvmod_std

[phk at varnish-cache.org]

Author: phk
Date: 2010-10-05 12:03:17 +0200 (Tue, 05 Oct 2010)
New Revision: 5405

Modified:
   trunk/varnish-cache/lib/libvcl/Makefile.am
   trunk/varnish-cache/lib/libvmod_std/Makefile.am
Log:
Try to make makefiles both make and gmake compliant



Modified: trunk/varnish-cache/lib/libvcl/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvcl/Makefile.am	2010-10-05 09:11:57 UTC (rev 5404)
+++ trunk/varnish-cache/lib/libvcl/Makefile.am	2010-10-05 10:03:17 UTC (rev 5405)
@@ -22,7 +22,7 @@
 	vcc_dir_dns.c \
 	vcc_expr.c \
 	vcc_parse.c \
-	$(builddir)/vcc_fixed_token.c \
+	vcc_fixed_token.c \
 	vcc_obj.c \
 	vcc_string.c \
 	vcc_symb.c \
@@ -34,7 +34,7 @@
 EXTRA_DIST = \
 	generate.py
 
-$(builddir)/vcc_obj.c $(builddir)/vcc_fixed_token.c $(builddir)/vcc_token_defs.h: $(srcdir)/generate.py $(top_srcdir)/include/vrt.h
+vcc_obj.c vcc_fixed_token.c vcc_token_defs.h: $(srcdir)/generate.py $(top_srcdir)/include/vrt.h
 	@PYTHON@ $(top_srcdir)/lib/libvcl/generate.py $(top_srcdir) $(top_builddir)
 
 CLEANFILES = $(builddir)/vcc_token_defs.h \

Modified: trunk/varnish-cache/lib/libvmod_std/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvmod_std/Makefile.am	2010-10-05 09:11:57 UTC (rev 5404)
+++ trunk/varnish-cache/lib/libvmod_std/Makefile.am	2010-10-05 10:03:17 UTC (rev 5405)
@@ -7,10 +7,10 @@
 libvmod_std_la_LDFLAGS = -version-info 1:0:0
 
 libvmod_std_la_SOURCES = \
-	$(builddir)/vcc_if.c \
+	vcc_if.c \
 	vmod_std.c
 
-$(builddir)/vcc_if.c $(builddir)/vcc_if.h: $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvmod_std/vmod.vcc
+vcc_if.c vcc_if.h: $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvmod_std/vmod.vcc
 	@PYTHON@ $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvmod_std/vmod.vcc
 
 EXTRA_DIST = vmod.py vmod.vcc