From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 25 Apr 2010 07:07:14 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bad8cf4b6cc04cb6b18322cf66ff0efdf77ff77;p=thirdparty%2Fsquid.git

Merge from trunk
---

0bad8cf4b6cc04cb6b18322cf66ff0efdf77ff77
diff --cc src/Makefile.am
index a7072e92b3,bc6c17ebe6..14ed9184a7
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -753,23 -753,23 +753,23 @@@ DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAU
  snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
  
  globals.cc: globals.h mk-globals-c.awk
- 	$(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || $(RM) -f $@
+ 	$(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || ($(RM) -f $@ && exit 1)
  
 -## Generate files containing strng arrays for various enums....
 +## Generate files containing string arrays for various enums....
  hier_code.cc: hier_code.h mk-string-arrays.awk
- 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/hier_code.h > $@ || $(RM) -f $@
+ 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/hier_code.h > $@ || ($(RM) -f $@ && exit 1)
  
  err_type.cc: err_type.h mk-string-arrays.awk
- 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_type.h > $@ || $(RM) -f $@
+ 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_type.h > $@ || ($(RM) -f $@ && exit 1)
  
  lookup_t.cc: lookup_t.h mk-string-arrays.awk
- 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || $(RM) -f $@
+ 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)
  
  icp_opcode.cc: icp_opcode.h mk-string-arrays.awk
- 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/icp_opcode.h > $@ || $(RM) -f $@
+ 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/icp_opcode.h > $@ || ($(RM) -f $@ && exit 1)
  
  swap_log_op.cc: swap_log_op.h mk-string-arrays.awk
- 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/swap_log_op.h > $@ || $(RM) -f $@
+ 	$(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/swap_log_op.h > $@ || ($(RM) -f $@ && exit 1)
  
  
  ## other generated files...