commit 438f2a5be6d809bc21611a94cd37bfc8c28ceb33
author openvcdiff@gmail.com <openvcdiff@gmail.com@132ac840-3546-0410-a738-d3f8764196be> Tue Apr 03 18:11:15 2012 +0000
committer openvcdiff@gmail.com <openvcdiff@gmail.com@132ac840-3546-0410-a738-d3f8764196be> Tue Apr 03 18:11:15 2012 +0000
tree 397b357285cc32d233d3537bf222757d937ea816
parent 64fe2324403ea78dbd781073f4e5b34768676e2c

Tue, 03 Apr 2012 09:59:09 -0700  Google Inc. <opensource@google.com>

  Release version 0.8.3 with the following changes:
  * Issue #34: Move zconf.h, zlib.h, and adler32.c into a zlib subdirectory to
    avoid conflicts with other revisions of these files included in Chromium.
    Please see: http://codereview.chromium.org/9555002/
  * Issue #32: Fix erroneous parameter in unit test.


git-svn-id: http://open-vcdiff.googlecode.com/svn/trunk@41 132ac840-3546-0410-a738-d3f8764196be

Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c3cbdf3..8fd75d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,6 +406,7 @@
 
 # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h>
 AM_CPPFLAGS = -I$(top_srcdir)/src \
+              -I$(top_srcdir)/src/zlib \
               -I$(top_srcdir)/gflags/src \
               -I$(top_srcdir)/gtest \
               -I$(top_srcdir)/gtest/include
@@ -488,9 +489,9 @@
 		       src/logging.h \
 		       src/varint_bigendian.h \
 		       src/vcdiff_defs.h \
-		       src/zlib.h \
-		       src/zconf.h \
-		       src/adler32.c \
+		       src/zlib/zlib.h \
+		       src/zlib/zconf.h \
+		       src/zlib/adler32.c \
 		       src/addrcache.cc \
 		       src/codetable.cc \
 		       src/logging.cc \
@@ -912,12 +913,12 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-adler32.lo: src/adler32.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adler32.lo -MD -MP -MF $(DEPDIR)/adler32.Tpo -c -o adler32.lo `test -f 'src/adler32.c' || echo '$(srcdir)/'`src/adler32.c
+adler32.lo: src/zlib/adler32.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adler32.lo -MD -MP -MF $(DEPDIR)/adler32.Tpo -c -o adler32.lo `test -f 'src/zlib/adler32.c' || echo '$(srcdir)/'`src/zlib/adler32.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/adler32.Tpo $(DEPDIR)/adler32.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/adler32.c' object='adler32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/zlib/adler32.c' object='adler32.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.lo `test -f 'src/adler32.c' || echo '$(srcdir)/'`src/adler32.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.lo `test -f 'src/zlib/adler32.c' || echo '$(srcdir)/'`src/zlib/adler32.c
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<