New command line utility, lz4 (notice the missing final 'c'), with gzip-style arguments (issue 83)

lz4c still there, supports additional gzip arguments, but also keep compatibility with legacy commands
lz4 (& lz4c) display version number
Fix : Sun Studio : compatible #pragma directive (issue 81)
Fix : compatible with Objective-C (iOS) (issue 79)
Fix : minor warnings using Visual Studio x64 (issue 80)
Changed : source file lz4c.c renamed lz4cli.c

git-svn-id: https://lz4.googlecode.com/svn/trunk@103 650e7d94-2a16-8b24-b05c-7c0b3f6821cd

1 files changed, 41 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 995b387..e81ba77 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,38 @@
+# ################################################################
+# LZ4 Makefile
+# Copyright (C) Yann Collet 2011-2013
+# GPL v2 License
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# You can contact the author at :
+#  - LZ4 source repository : http://code.google.com/p/lz4/
+# ################################################################
+# lz4 : Command Line Utility, supporting gzip-like arguments
+# lz4c  : CLU, supporting also legacy lz4demo arguments
+# lz4c32: Same as lz4c, but forced to compile in 32-bits mode
+# fuzzer  : Test tool, to check lz4 integrity on target platform
+# fuzzer32: Same as fuzzer, but forced to compile in 32-bits mode
+# fullbench  : Precisely measure speed for each LZ4 function variant
+# fullbench32: Same as fullbench, but forced to compile in 32-bits mode
+# ################################################################
+
 CC=gcc
 CFLAGS=-I. -std=c99 -Wall -W -Wundef -Wno-implicit-function-declaration
 
+# Define *.exe as extension for Windows systems
 OS := $(shell uname)
 ifeq ($(OS),Linux)
 EXT =
@@ -10,20 +42,21 @@ endif
 
 default: lz4c
 
-all: lz4c lz4cs lz4c32 fuzzer fuzzer32 fullbench fullbench32
+all: lz4 lz4c lz4c32 fuzzer fuzzer32 fullbench fullbench32
 
-lz4c: lz4.c lz4hc.c bench.c xxhash.c lz4c.c
-	$(CC)      -O3 $(CFLAGS) $^ -o $@$(EXT)
+lz4: lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
+	$(CC)      -O3 $(CFLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
 
-lz4cs: lz4.c lz4hc.c bench.c xxhash.c lz4c.c
-	$(CC)      -Os $(CFLAGS) $^ -o $@$(EXT)
+lz4c: lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
+	$(CC)      -O3 $(CFLAGS) $^ -o $@$(EXT)
 
-lz4c32: lz4.c lz4hc.c bench.c xxhash.c lz4c.c
+lz4c32: lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
 	$(CC) -m32 -O3 $(CFLAGS) $^ -o $@$(EXT)
 
 fuzzer : lz4.c lz4hc.c fuzzer.c
+	@echo fuzzer is a test tool to check lz4 integrity on target platform
 	$(CC)      -O3 $(CFLAGS) $^ -o $@$(EXT)
-	
+
 fuzzer32 : lz4.c lz4hc.c fuzzer.c
 	$(CC) -m32 -O3 $(CFLAGS) $^ -o $@$(EXT)
 
@@ -34,4 +67,4 @@ fullbench32 : lz4.c lz4hc.c xxhash.c fullbench.c
 	$(CC) -m32 -O3 $(CFLAGS) $^ -o $@$(EXT)
 
 clean:
-	rm -f core *.o lz4c$(EXT) lz4cs$(EXT) lz4c32$(EXT) fuzzer$(EXT) fullbench$(EXT) fullbench32$(EXT)
+	rm -f core *.o lz4$(EXT) lz4c$(EXT) lz4c32$(EXT) fuzzer$(EXT) fuzzer32$(EXT) fullbench$(EXT) fullbench32$(EXT)