r5153 - trunk/varnish-cache/lib/libvmod_std

[phk at varnish-cache.org]

Author: phk
Date: 2010-08-30 14:37:23 +0200 (Mon, 30 Aug 2010)
New Revision: 5153

Modified:
   trunk/varnish-cache/lib/libvmod_std/Makefile.am
   trunk/varnish-cache/lib/libvmod_std/vmod.py
   trunk/varnish-cache/lib/libvmod_std/vmod_std.c
Log:
Rename the generated files from vmod.[ch] to vcc_if.[ch] to avoid
clashing with include/vmod.h



Modified: trunk/varnish-cache/lib/libvmod_std/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvmod_std/Makefile.am	2010-08-30 12:09:42 UTC (rev 5152)
+++ trunk/varnish-cache/lib/libvmod_std/Makefile.am	2010-08-30 12:37:23 UTC (rev 5153)
@@ -7,12 +7,12 @@
 libvmod_std_la_LDFLAGS = -version-info 1:0:0
 
 libvmod_std_la_SOURCES = \
-	$(builddir)/vmod.c \
+	$(builddir)/vcc_if.c \
 	vmod_std.c
 
-$(builddir)/vmod.c $(builddir)/vmod.h: $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvmod_std/vmod.vcc
+$(builddir)/vcc_if.c $(builddir)/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
 
-CLEANFILES = $(builddir)/vmod.c $(builddir)/vmod.h
+CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h

Modified: trunk/varnish-cache/lib/libvmod_std/vmod.py
===================================================================
--- trunk/varnish-cache/lib/libvmod_std/vmod.py	2010-08-30 12:09:42 UTC (rev 5152)
+++ trunk/varnish-cache/lib/libvmod_std/vmod.py	2010-08-30 12:37:23 UTC (rev 5153)
@@ -156,15 +156,15 @@
 
 #######################################################################
 
-fc = open("vmod.c", "w")
-fh = open("vmod.h", "w")
+fc = open("vcc_if.c", "w")
+fh = open("vcc_if.h", "w")
 
 fh.write('struct sess;\n')
 fh.write("\n");
 
 fh.write(plist)
 
-fc.write('#include "vmod.h"\n')
+fc.write('#include "vcc_if.h"\n')
 fc.write("\n");
 
 fc.write('struct sess;\n')

Modified: trunk/varnish-cache/lib/libvmod_std/vmod_std.c
===================================================================
--- trunk/varnish-cache/lib/libvmod_std/vmod_std.c	2010-08-30 12:09:42 UTC (rev 5152)
+++ trunk/varnish-cache/lib/libvmod_std/vmod_std.c	2010-08-30 12:37:23 UTC (rev 5153)
@@ -3,7 +3,7 @@
 #include "vrt.h"
 #include "../../bin/varnishd/cache.h"
 
-#include "vmod.h"
+#include "vcc_if.h"
 
 const char *
 vmod_toupper(struct sess *sp, const char *s, ...)