From ace5e90b3dbc33f0fc34ac2f3dc40d3c990a6a11 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 2 Jul 2012 17:28:05 +0200
Subject: Update lzo version

---
 lzo/B/generic/Makefile     | 4 ++--
 lzo/B/generic/build.sh     | 4 ++--
 lzo/B/generic/build_gcc.sh | 2 +-
 lzo/B/generic/clean.sh     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lzo/B/generic')

diff --git a/lzo/B/generic/Makefile b/lzo/B/generic/Makefile
index 88caf3a2..acddb04e 100644
--- a/lzo/B/generic/Makefile
+++ b/lzo/B/generic/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
 #
 # this is modelled after build.sh; needs GNU make 3.80 or better
 
@@ -14,7 +14,7 @@ AR ?= ar
 CC ?= cc
 CFLAGS ?= -O
 
-CFI = -I$(top_srcdir)/include -I$(top_srcdir)
+CFI = -I$(top_srcdir)/include -I$(top_srcdir) -I$(top_srcdir)/src
 BNAME = lzo2
 BLIB = lib$(BNAME).a
 
diff --git a/lzo/B/generic/build.sh b/lzo/B/generic/build.sh
index 5456e056..1bf5585b 100755
--- a/lzo/B/generic/build.sh
+++ b/lzo/B/generic/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # vi:ts=4:et
 set -e
-echo "// Copyright (C) 1996-2008 Markus F.X.J. Oberhumer"
+echo "// Copyright (C) 1996-2011 Markus F.X.J. Oberhumer"
 echo "//"
 echo "//   Generic Posix/Unix system"
 echo "//   Generic C compiler"
@@ -15,7 +15,7 @@ test "X${CFLAGS+set}" = Xset || CFLAGS="-O"
 # LZO_EXTRA_CPPFLAGS, LZO_EXTRA_CFLAGS, LZO_EXTRA_LDFLAGS
 # LZO_EXTRA_SOURCES, LZO_EXTRA_OBJECTS, LZO_EXTRA_LIBS
 
-CFI="-I${top_srcdir}/include -I${top_srcdir}"
+CFI="-I${top_srcdir}/include -I${top_srcdir} -I${top_srcdir}/src"
 BNAME=lzo2
 BLIB=lib${BNAME}.a
 
diff --git a/lzo/B/generic/build_gcc.sh b/lzo/B/generic/build_gcc.sh
index 3aaa4aa0..179d8c0f 100755
--- a/lzo/B/generic/build_gcc.sh
+++ b/lzo/B/generic/build_gcc.sh
@@ -10,7 +10,7 @@ UNAME_MACHINE=unknown
 CC="gcc -fPIC"
 CC="gcc -static"
 CC="gcc"
-CFLAGS="-Wall -Wno-uninitialized -O2 -fomit-frame-pointer"
+CFLAGS="-Wall -O2 -fomit-frame-pointer"
 
 # delete the next line to disable assembler support
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
diff --git a/lzo/B/generic/clean.sh b/lzo/B/generic/clean.sh
index 0a946cc2..11c23951 100755
--- a/lzo/B/generic/clean.sh
+++ b/lzo/B/generic/clean.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # vi:ts=4:et
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
 
 rm -f *.o liblzo2.a dict.out lzopack.out precomp.out precomp2.out simple.out lzotest.out testmini.out
 
-- 
cgit v1.2.3