]> git.ipfire.org Git - thirdparty/zlib-ng.git/log
thirdparty/zlib-ng.git
9 years agoRemove now obsolete comment 49/head
tbeu [Tue, 6 Oct 2015 19:53:40 +0000 (21:53 +0200)] 
Remove now obsolete comment

... about snprintf() being not available in MSVC

10 years agoImprove dictionary handling.
Hans Kristian Rosbach [Thu, 11 Jun 2015 15:05:30 +0000 (17:05 +0200)] 
Improve dictionary handling.
Based on commit e07ac7d8 from Cloudflare's fork, by Vlad Krasnov.

10 years agoAllow building on OS X
RenĂ© J.V. Bertin [Tue, 9 Jun 2015 21:59:15 +0000 (23:59 +0200)] 
Allow building on OS X

10 years agoMerge branch 'codestyle' into develop
Hans Kristian Rosbach [Fri, 5 Jun 2015 16:37:34 +0000 (18:37 +0200)] 
Merge branch 'codestyle' into develop

10 years agoRevert "Replace 'unsigned long' with most suitable fixed-size type."
Hans Kristian Rosbach [Fri, 5 Jun 2015 16:34:42 +0000 (18:34 +0200)] 
Revert "Replace 'unsigned long' with most suitable fixed-size type."

This commit was cherry-picked and was not done, resulting in a few
problems with gcc on 64bit windows.

This reverts commit edd7a72e056b994458ff040d4740b16b35336b60.

Conflicts:
arch/x86/crc_folding.c
arch/x86/fill_window_sse.c
deflate.c
deflate.h
match.c
trees.c

10 years agoMerge pull request #39 from mtl1979/minigzip
Hans Kristian Rosbach [Fri, 5 Jun 2015 16:05:44 +0000 (18:05 +0200)] 
Merge pull request #39 from mtl1979/minigzip

minigzip: allocate temporary buffer inside gzopen.

This fixes the abysmally slow minigzip decompression when compiling without --zlib-compat

10 years agominigzip: allocate temporary buffer inside gzopen. 39/head
Mika Lindqvist [Tue, 26 May 2015 12:51:58 +0000 (15:51 +0300)] 
minigzip: allocate temporary buffer inside gzopen.

10 years agoMerge pull request #37 from Dead2/codestyle
Hans Kristian Rosbach [Thu, 4 Jun 2015 18:40:31 +0000 (20:40 +0200)] 
Merge pull request #37 from Dead2/codestyle

Clean up the code to more closely match the Google styleguide

10 years agoMerge pull request #38 from mtl1979/vc14
Hans Kristian Rosbach [Thu, 4 Jun 2015 16:19:54 +0000 (18:19 +0200)] 
Merge pull request #38 from mtl1979/vc14

Improve support for Visual Studio 2015.

10 years agoFix detecting Windows in zconf.h(.in) 38/head
Mika Lindqvist [Sat, 30 May 2015 17:54:30 +0000 (20:54 +0300)] 
Fix detecting Windows in zconf.h(.in)

10 years agosnprintf() was added to Visual Studio 2015.
Mika Lindqvist [Fri, 29 May 2015 23:13:47 +0000 (02:13 +0300)] 
snprintf() was added to Visual Studio 2015.

10 years agoFix compile errors in trees.c after style cleanup 37/head
Hans Kristian Rosbach [Mon, 25 May 2015 21:17:58 +0000 (23:17 +0200)] 
Fix compile errors in trees.c after style cleanup

10 years agoStyle cleanup for trees.*
Hans Kristian Rosbach [Mon, 25 May 2015 21:05:13 +0000 (23:05 +0200)] 
Style cleanup for trees.*

10 years agoStyle cleanup for compress/uncompress and longest_match code
Hans Kristian Rosbach [Mon, 25 May 2015 21:04:39 +0000 (23:04 +0200)] 
Style cleanup for compress/uncompress and longest_match code

10 years agoStyle cleanup for zutil.h
Hans Kristian Rosbach [Mon, 25 May 2015 21:03:56 +0000 (23:03 +0200)] 
Style cleanup for zutil.h

10 years agoStyle cleanup for adler/crc code
Hans Kristian Rosbach [Mon, 25 May 2015 21:03:25 +0000 (23:03 +0200)] 
Style cleanup for adler/crc code

10 years agoStyle cleanup for gzfile code
Hans Kristian Rosbach [Mon, 25 May 2015 21:01:55 +0000 (23:01 +0200)] 
Style cleanup for gzfile code

10 years agoStyle cleanup for deflate code
Hans Kristian Rosbach [Mon, 25 May 2015 21:01:26 +0000 (23:01 +0200)] 
Style cleanup for deflate code

10 years agoStyle cleanup for inflate code
Hans Kristian Rosbach [Mon, 25 May 2015 21:00:54 +0000 (23:00 +0200)] 
Style cleanup for inflate code

10 years agoStyle cleanup for zlib.h
Hans Kristian Rosbach [Mon, 25 May 2015 21:00:05 +0000 (23:00 +0200)] 
Style cleanup for zlib.h

10 years agoStyle cleanup for arch/x86
Hans Kristian Rosbach [Mon, 25 May 2015 20:59:26 +0000 (22:59 +0200)] 
Style cleanup for arch/x86

10 years agoAdd likely/unlikely support for ICC and Clang
Hans Kristian Rosbach [Sun, 24 May 2015 17:53:41 +0000 (19:53 +0200)] 
Add likely/unlikely support for ICC and Clang

10 years agoRemove support for NO_DEFLATE
Hans Kristian Rosbach [Sun, 24 May 2015 17:34:12 +0000 (19:34 +0200)] 
Remove support for NO_DEFLATE

10 years agoReplace 'unsigned long' with most suitable fixed-size type.
Mika Lindqvist [Mon, 18 May 2015 19:11:02 +0000 (22:11 +0300)] 
Replace 'unsigned long' with most suitable fixed-size type.

10 years agoStyle cleanup.
Mika Lindqvist [Thu, 7 May 2015 16:29:27 +0000 (19:29 +0300)] 
Style cleanup.

10 years agoMerge branch 'develop' of github.com:Dead2/zlib-ng into develop
Hans Kristian Rosbach [Sat, 23 May 2015 19:15:42 +0000 (21:15 +0200)] 
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

10 years agoUpdate remaining function prototypes to ANSI C standard
Hans Kristian Rosbach [Sat, 23 May 2015 19:14:45 +0000 (21:14 +0200)] 
Update remaining function prototypes to ANSI C standard

10 years agoRemove unused hash_head input parameter from function emit_match
Hans Kristian Rosbach [Sat, 23 May 2015 19:04:39 +0000 (21:04 +0200)] 
Remove unused hash_head input parameter from function emit_match

10 years agoMerge pull request #36 from mtl1979/uchar
Hans Kristian Rosbach [Sat, 23 May 2015 07:54:06 +0000 (09:54 +0200)] 
Merge pull request #36 from mtl1979/uchar

Cleanup user-defined types for 'unsigned char'

10 years agoCleanup user-defined types for 'unsigned char' 36/head
Mika Lindqvist [Fri, 22 May 2015 22:17:27 +0000 (01:17 +0300)] 
Cleanup user-defined types for 'unsigned char'
* Change 'uch' to 'unsigned char'
* Change 'Byte' to 'unsigned char'

10 years agoMerge pull request #35 from mtl1979/cleanup
Hans Kristian Rosbach [Fri, 22 May 2015 20:37:49 +0000 (22:37 +0200)] 
Merge pull request #35 from mtl1979/cleanup

Replace (void *)0 with NULL.

10 years agoDont set hash_head, it is overwritten before being accessed again.
Hans Kristian Rosbach [Fri, 22 May 2015 20:32:42 +0000 (22:32 +0200)] 
Dont set hash_head, it is overwritten before being accessed again.

10 years agoMake it clear for the compiler that fill_window_c is never
Hans Kristian Rosbach [Fri, 22 May 2015 20:26:18 +0000 (22:26 +0200)] 
Make it clear for the compiler that fill_window_c is never
going to be called if sse2 is enabled and the check is disabled.

10 years agoReplace (void *)0 with NULL. 35/head
Mika Lindqvist [Mon, 18 May 2015 22:35:49 +0000 (01:35 +0300)] 
Replace (void *)0 with NULL.

10 years agoActually set err before checking it
Hans Kristian Rosbach [Fri, 22 May 2015 20:04:25 +0000 (22:04 +0200)] 
Actually set err before checking it

10 years agoMerge pull request #34 from mtl1979/ushort
Hans Kristian Rosbach [Fri, 22 May 2015 19:26:00 +0000 (21:26 +0200)] 
Merge pull request #34 from mtl1979/ushort

Change "unsigned short" and "ush" to "uint16_t"

10 years agoReplace unsigned short with uint16_t 34/head
Hans Kristian Rosbach [Sat, 16 May 2015 19:23:07 +0000 (21:23 +0200)] 
Replace unsigned short with uint16_t

Conflicts:
inflate.h
inftrees.c
inftrees.h
match.c

10 years agoReplace ush with uint16_t
Hans Kristian Rosbach [Sat, 16 May 2015 19:15:51 +0000 (21:15 +0200)] 
Replace ush with uint16_t

Conflicts:
deflate.c
deflate.h
trees.c
zutil.h

10 years agoMerge pull request #33 from mtl1979/infcover
Hans Kristian Rosbach [Fri, 22 May 2015 15:45:32 +0000 (17:45 +0200)] 
Merge pull request #33 from mtl1979/infcover

Cleanup test/infcover.c

10 years agoMerge pull request #32 from mtl1979/vc14
Hans Kristian Rosbach [Fri, 22 May 2015 15:43:51 +0000 (17:43 +0200)] 
Merge pull request #32 from mtl1979/vc14

snprintf() was added to Visual Studio 2015.

10 years agoRemove "local" as it was always defined as "static" 33/head
Mika Lindqvist [Fri, 22 May 2015 14:20:48 +0000 (17:20 +0300)] 
Remove "local" as it was always defined as "static"
* If reallocf() is not available, don't call realloc directly as it might
  cause memory leak.

10 years agosnprintf() was added to Visual Studio 2015. 32/head
Mika Lindqvist [Wed, 20 May 2015 19:57:56 +0000 (22:57 +0300)] 
snprintf() was added to Visual Studio 2015.

10 years agoMerge branch 'develop' of github.com:Dead2/zlib-ng into develop
Hans Kristian Rosbach [Sun, 17 May 2015 16:12:48 +0000 (18:12 +0200)] 
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

10 years agoKill Byte and Bytef
Daniel Axtens [Fri, 8 May 2015 11:46:51 +0000 (21:46 +1000)] 
Kill Byte and Bytef

Signed-off-by: Daniel Axtens <dja@axtens.net>
Conflicts:
adler32.c
compress.c
deflate.c
inflate.c
match.c
test/example.c
uncompr.c
zlib.h

10 years agoReplace NULL comparisons
Hans Kristian Rosbach [Thu, 14 May 2015 10:04:51 +0000 (12:04 +0200)] 
Replace NULL comparisons

Conflicts:
trees.c

10 years agoMerge pull request #30 from mtl1979/mingw
Hans Kristian Rosbach [Thu, 14 May 2015 17:09:00 +0000 (19:09 +0200)] 
Merge pull request #30 from mtl1979/mingw

Fix ARCH detection when default target of gcc doesn't match uname.

10 years agoFix ARCH detection when default target of gcc doesn't match uname. 30/head
Mika Lindqvist [Thu, 14 May 2015 12:13:18 +0000 (15:13 +0300)] 
Fix ARCH detection when default target of gcc doesn't match uname.

10 years agoMerge pull request #29 from mtl1979/mingw
Hans Kristian Rosbach [Wed, 13 May 2015 20:34:45 +0000 (22:34 +0200)] 
Merge pull request #29 from mtl1979/mingw

Fix MinGW and infcover related problems

10 years agoFix MinGW failing to find infcover.exe when stripping the executable. 29/head
Mika Lindqvist [Wed, 13 May 2015 18:34:32 +0000 (21:34 +0300)] 
Fix MinGW failing to find infcover.exe when stripping the executable.
Fix compiling infcover.c under MinGW

10 years agoFix building under MinGW64.
Mika Lindqvist [Wed, 13 May 2015 17:36:09 +0000 (20:36 +0300)] 
Fix building under MinGW64.

10 years agoMerge pull request #28 from mtl1979/cygwin
Hans Kristian Rosbach [Wed, 13 May 2015 14:56:15 +0000 (16:56 +0200)] 
Merge pull request #28 from mtl1979/cygwin

Integrate win32/Makefile.gcc into Makefile.in

10 years agoIntegrate win32/Makefile.gcc into Makefile.in 28/head
Mika Lindqvist [Tue, 12 May 2015 10:02:33 +0000 (13:02 +0300)] 
Integrate win32/Makefile.gcc into Makefile.in

10 years agoFix unnecessary type casts.
Mika Lindqvist [Wed, 13 May 2015 14:45:27 +0000 (17:45 +0300)] 
Fix unnecessary type casts.

10 years agoFix const warning.
Mika Lindqvist [Wed, 13 May 2015 12:42:54 +0000 (15:42 +0300)] 
Fix const warning.

10 years agoKill z_crc_t
Daniel Axtens [Mon, 11 May 2015 13:29:29 +0000 (23:29 +1000)] 
Kill z_crc_t

Signed-off-by: Daniel Axtens <dja@axtens.net>
Conflicts:
crc32.c

10 years agoRemove z_const leftovers
Hans Kristian Rosbach [Wed, 13 May 2015 12:24:13 +0000 (14:24 +0200)] 
Remove z_const leftovers

10 years agoz_const -> const
Daniel Axtens [Fri, 8 May 2015 09:36:07 +0000 (19:36 +1000)] 
z_const -> const

Signed-off-by: Daniel Axtens <dja@axtens.net>
Conflicts:
arch/x86/crc_folding.c
crc32.c

10 years agoFix regression with missing combine64 functions after b3dca09 19/head
Hans Kristian Rosbach [Wed, 13 May 2015 10:12:21 +0000 (12:12 +0200)] 
Fix regression with missing combine64 functions after b3dca09

10 years agoRemove Z_PREFIX leftovers
Hans Kristian Rosbach [Wed, 13 May 2015 09:48:54 +0000 (11:48 +0200)] 
Remove Z_PREFIX leftovers

10 years agoFix integer overflow warning
Mika Lindqvist [Tue, 12 May 2015 23:21:25 +0000 (02:21 +0300)] 
Fix integer overflow warning
* Move declaration of "plevel" below declaration of "level"

10 years agoFix minor merge conflict
Hans Kristian Rosbach [Tue, 12 May 2015 21:22:47 +0000 (23:22 +0200)] 
Fix minor merge conflict

10 years agoAdd level support in minigzip.
Mika Lindqvist [Tue, 12 May 2015 20:53:30 +0000 (23:53 +0300)] 
Add level support in minigzip.

10 years agoFix signed/unsigned mismatch in match.c
Mika Lindqvist [Thu, 7 May 2015 00:38:36 +0000 (03:38 +0300)] 
Fix signed/unsigned mismatch in match.c

10 years agoMinigzip: Set compression level to default when compiling without ZLIB_COMPAT.
Hans Kristian Rosbach [Tue, 12 May 2015 20:22:03 +0000 (22:22 +0200)] 
Minigzip: Set compression level to default when compiling without ZLIB_COMPAT.
(level is available in mode[2], needs to be parsed)

10 years agoConvert remaining K&R function declarations to ANSI-C declarations.
Hans Kristian Rosbach [Tue, 12 May 2015 16:54:20 +0000 (18:54 +0200)] 
Convert remaining K&R function declarations to ANSI-C declarations.

10 years agoMerge branch 'develop' of github.com:Dead2/zlib-ng into develop
Hans Kristian Rosbach [Tue, 12 May 2015 14:04:15 +0000 (16:04 +0200)] 
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

10 years agoMinor cleanup of includefiles relating mostly to stdint.h
Hans Kristian Rosbach [Tue, 12 May 2015 14:03:14 +0000 (16:03 +0200)] 
Minor cleanup of includefiles relating mostly to stdint.h

10 years agoMerge pull request #27 from mtl1979/gzopen_w
Hans Kristian Rosbach [Tue, 12 May 2015 09:54:37 +0000 (11:54 +0200)] 
Merge pull request #27 from mtl1979/gzopen_w

Merge Cygwin and Win32 related fixes

10 years agoCombine CRC32_UNROLL_LESS and ADLER32_UNROLL_LESS into UNROLL_LESS
Hans Kristian Rosbach [Tue, 12 May 2015 09:48:14 +0000 (11:48 +0200)] 
Combine CRC32_UNROLL_LESS and ADLER32_UNROLL_LESS into UNROLL_LESS

10 years agoMerge branch 'develop' of github.com:Dead2/zlib-ng into develop
Hans Kristian Rosbach [Tue, 12 May 2015 09:43:11 +0000 (11:43 +0200)] 
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

10 years agoFix merge conflicts
Hans Kristian Rosbach [Tue, 12 May 2015 09:42:45 +0000 (11:42 +0200)] 
Fix merge conflicts

10 years agoEnable gzopen_w for Cygwin 27/head
Mika Lindqvist [Mon, 11 May 2015 21:02:02 +0000 (00:02 +0300)] 
Enable gzopen_w for Cygwin

10 years agoMerge pull request #26 from mtl1979/includes
Hans Kristian Rosbach [Tue, 12 May 2015 09:29:50 +0000 (11:29 +0200)] 
Merge pull request #26 from mtl1979/includes

Use INCLUDES in root Makefile.in too

10 years agoCmake: Add support for WITH_GZFILEOP and ZLIB_COMPAT
Hans Kristian Rosbach [Tue, 12 May 2015 09:24:47 +0000 (11:24 +0200)] 
Cmake: Add support for WITH_GZFILEOP and ZLIB_COMPAT

10 years agoRemove support for compiling with Z_SOLO.
Hans Kristian Rosbach [Mon, 11 May 2015 13:55:42 +0000 (15:55 +0200)] 
Remove support for compiling with Z_SOLO.
Make compiling without gzip file operation support the default
 (define WITH_GZFILEOP or use --zlib-compat to enable them).
Add initial support for compiling in a zlib-compatible mode, this currently only
 enables gzip file operations and sets the ZLIB_COMPAT flag.

Conflicts:
test/minigzip.c

10 years agoUse INCLUDES in root Makefile.in too 26/head
Mika Lindqvist [Mon, 11 May 2015 20:14:22 +0000 (23:14 +0300)] 
Use INCLUDES in root Makefile.in too

10 years agoAdd test for reallocf. 24/head
Mika Lindqvist [Mon, 11 May 2015 18:43:16 +0000 (21:43 +0300)] 
Add test for reallocf.

10 years agoDo not build with -Werror by default.
Hans Kristian Rosbach [Mon, 11 May 2015 19:12:31 +0000 (21:12 +0200)] 
Do not build with -Werror by default.

10 years agoadler32: unsigned long -> uint32_t
Daniel Axtens [Mon, 11 May 2015 13:23:13 +0000 (23:23 +1000)] 
adler32: unsigned long -> uint32_t

Authored by Danial Axtens, with some minor merge fixups by Hans Kristian Rosbach.

Conflicts:
adler32.c
zlib.h
zutil.h

10 years agoadler32: local -> static
Daniel Axtens [Mon, 11 May 2015 13:20:01 +0000 (23:20 +1000)] 
adler32: local -> static

Signed-off-by: Daniel Axtens <dja@axtens.net>
Conflicts:
adler32.c

10 years agocrc32: unsigned long -> uint32_t
Daniel Axtens [Mon, 11 May 2015 13:18:38 +0000 (23:18 +1000)] 
crc32: unsigned long -> uint32_t

 Authored by Danial Axtens, plus merge fixups by Hans Kristian Rosbach.

Conflicts:
arch/x86/crc_folding.c
crc32.c
zlib.h
zutil.h

10 years agocrc32: local -> static
Daniel Axtens [Mon, 11 May 2015 13:06:17 +0000 (23:06 +1000)] 
crc32: local -> static

Authored by Danial Axtens, with some minor merge fixups by Hans Kristian Rosbach.

Conflicts:
crc32.c

10 years agoDrop MAXSEG_64K: our machines have segments greater than 64K
Daniel Axtens [Fri, 8 May 2015 11:14:20 +0000 (21:14 +1000)] 
Drop MAXSEG_64K: our machines have segments greater than 64K

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoRemove UNDER_CE: Windows CE is old.
Daniel Axtens [Fri, 8 May 2015 11:11:26 +0000 (21:11 +1000)] 
Remove UNDER_CE: Windows CE is old.

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoCleanup endianness test. 25/head
Mika Lindqvist [Mon, 11 May 2015 10:11:12 +0000 (13:11 +0300)] 
Cleanup endianness test.

10 years agoconfigure: Support MinGW, Cygwin and MSYS.
Yuta NAKAI [Fri, 8 May 2015 15:40:28 +0000 (00:40 +0900)] 
configure: Support MinGW, Cygwin and MSYS.

10 years agoKill BYFOUR --- there's no reason to disabled it (NOBYFOUR)
Daniel Axtens [Sat, 9 May 2015 05:58:59 +0000 (15:58 +1000)] 
Kill BYFOUR --- there's no reason to disabled it (NOBYFOUR)

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoMerge branch 'develop' of github.com:Dead2/zlib-ng into develop
Hans Kristian Rosbach [Mon, 11 May 2015 09:18:27 +0000 (11:18 +0200)] 
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

10 years agoKill VMS support in zconf.h
Daniel Axtens [Sat, 9 May 2015 06:10:23 +0000 (16:10 +1000)] 
Kill VMS support in zconf.h

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoKill Z_ARG()
Daniel Axtens [Fri, 8 May 2015 06:09:09 +0000 (16:09 +1000)] 
Kill Z_ARG()

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoKill OF()
Daniel Axtens [Fri, 8 May 2015 06:05:13 +0000 (16:05 +1000)] 
Kill OF()

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoKill z_ prefix support
Daniel Axtens [Fri, 8 May 2015 05:48:42 +0000 (15:48 +1000)] 
Kill z_ prefix support

10 years agoMerge pull request #22 from mtl1979/temp3
Hans Kristian Rosbach [Fri, 8 May 2015 13:35:53 +0000 (15:35 +0200)] 
Merge pull request #22 from mtl1979/temp3

Move generating zconf.h.cmakein from Makefile.in to CMakeLists.txt

10 years agoMerge pull request #23 from daxtens/travis_cmake
Hans Kristian Rosbach [Fri, 8 May 2015 13:34:36 +0000 (15:34 +0200)] 
Merge pull request #23 from daxtens/travis_cmake

Test cmake with Travis

10 years agoTest cmake with Travis 23/head
Daniel Axtens [Fri, 8 May 2015 13:21:53 +0000 (23:21 +1000)] 
Test cmake with Travis

Signed-off-by: Daniel Axtens <dja@axtens.net>
10 years agoMove generating zconf.h.cmakein from Makefile.in to CMakeLists.txt 22/head
Mika Lindqvist [Fri, 8 May 2015 12:33:49 +0000 (15:33 +0300)] 
Move generating zconf.h.cmakein from Makefile.in to CMakeLists.txt
* nmake doesn't convert / to \ when file doesn't exist, so use \
  explicitly when copying zconf.h.in as zconf.h

10 years agoMerge branch 'develop' of github.com:Dead2/zlib-ng into develop
Hans Kristian Rosbach [Fri, 8 May 2015 13:09:34 +0000 (15:09 +0200)] 
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop

10 years agoAdd README file with markup code enabled, allows links and images to be shown on...
Hans Kristian Rosbach [Fri, 8 May 2015 13:07:19 +0000 (15:07 +0200)] 
Add README file with markup code enabled, allows links and images to be shown on github.

10 years agoMerge pull request #21 from daxtens/develop
Hans Kristian Rosbach [Fri, 8 May 2015 13:02:56 +0000 (15:02 +0200)] 
Merge pull request #21 from daxtens/develop

Unbreak things: import the right zconf.h

10 years agoMerge pull request #20 from mtl1979/temp2
Hans Kristian Rosbach [Fri, 8 May 2015 09:17:23 +0000 (11:17 +0200)] 
Merge pull request #20 from mtl1979/temp2

Makefile cleanup