Commit Graph

89 Commits

Author SHA1 Message Date
Jan-Erik Rediger
8999750f12 Revert "Always compile with C99 standard."
This reverts commit d8145d79ce.
2015-05-03 22:32:42 +02:00
Jan-Erik Rediger
d8145d79ce Always compile with C99 standard.
Turns out: gnu9x defines `unix` to 1, making it unusable as a variable
name.
2015-04-16 22:51:32 +02:00
David Watson
dc13bc8627 Add PKGCONFNAME to install dependencies.
Attempting to use the install target before the make target works fine,
except for the missing pkgconfig file.  Adding that file to the
dependencies for the install target to make sure it gets created first.
2015-03-28 12:17:11 -04:00
Jan-Erik Rediger
30814af63c Correct escaping for prefix in pkgconf file 2015-03-19 09:21:25 +01:00
Dan Skorupski
97364ed59a Fix hiredis.pc generation. 2015-03-18 18:56:11 -05:00
Dominique Leuenberger
37c06facda Fix pkgconf file: escaping needed
Due to the various processors going over the command, we need more
escaping.

1) Make parses it, so $${libdir} becomes ${libdir}
2) 'shell' parses it for the 'echo command', whereas echo ${libdir}
would be an empty string; escape it as \${libdir} to ensure we get what
we want.

Closes #312
2015-03-03 08:12:49 -08:00
Matt Stancliff
6b122d43f9 Fix pkgconf when used with DESTDIR
Closes #302
2015-02-12 13:58:14 -05:00
Matt Stancliff
2b2b512dca Build test binary by default
This is the only way to force a 32-bit build of the test binary
2015-01-26 10:08:12 -05:00
Matt Stancliff
74f53e30db Fix pkgconf build dependency
We need to re-gen pkgconf when the version changes, and the version
is kept in hiredis.h, so make pkgconf depend on hiredis.h.
2015-01-26 09:41:11 -05:00
Sebastian Wiedenroth
4355ab3c8f Fix Makefile install problems
Adds DESTDIR support
Fixes INSTALL_PKGCONF_PATH
Properly copies {read,shs}.h now during make install

Closes #297
2015-01-26 09:30:17 -05:00
Matt Stancliff
dd680fcc14 Add valgrind to TravisCI testing 2015-01-22 16:00:38 -05:00
Matt Stancliff
dad0516423 Update dependency list in Makefile 2015-01-05 16:53:23 -05:00
Matt Stancliff
9abfdf9405 Build static library by default 2015-01-05 16:53:23 -05:00
Matt Stancliff
1d2b4d38db Generate pkgconf during build
The pkgconf source is localized to the Makefile, so we're not dropping
an unnecessary "hiredis.pc.in" in the source directory.

Closes #129
Closes #136
2015-01-05 16:53:23 -05:00
tzickel
ba3e74c408 Refactor reading code into read.c
Makes hiredis reading functions easier to include in external projects

[fixed all merge conflicts against current version]

Closes #249
2015-01-05 16:53:22 -05:00
Christian Hergert
0c9ff5bb03 Add GLib 2.0 adapter
[Cleaned up Makefile and header includes.  Didn't change crazy
coding style because it's the convention for GLib systems.]

Closes #83
Closes #71
2015-01-05 16:39:30 -05:00
Pieter Noordhuis
f225c276be Fix HIREDIS_MINOR
Closes #219.
2014-04-09 23:16:33 -07:00
Eddy Jansson
05fb7be3ea Fix Makefile test to use more compatible syntax
The existing way is not compatible with a lot of shells, including most
bash installations, because the echos that generates the configuration
sent to redis-server doesn't expand the escapes. Adding '-e' to the
echo works under bash, but breaks on the Travis CI server.

This is my attempt to find an alternative that works everywhere.
[committer note: it doesn't work under Solaris make, but the Makefile
was already broken under Solaris make.  Solaris users must use gmake.]

Closes #224 and Closes #221
2014-04-09 17:02:43 -04:00
Aaron Bedra
c552ca6904 Move examples into their own folder
Closes #166.
2013-07-10 22:16:53 -07:00
Pieter Noordhuis
c8234a3193 Merge branch 'libuv'
Closes #172.
2013-07-10 21:47:53 -07:00
Pieter Noordhuis
efe990d07d Fix path to static libuv library 2013-07-10 21:47:44 -07:00
Pieter Noordhuis
9d9e4a3b4f Remove unused Makefile variables
Fixes #176.
2013-07-10 21:24:46 -07:00
Erik Dubbelboer
fc55afb1b6 Made example-ae work again 2013-07-02 19:24:02 +02:00
Erik Dubbelboer
61277d0925 Added libuv adapter 2013-06-04 15:06:43 +02:00
antirez
7f346477c8 Add ARCH to Makefile CFLAGS / LDFLAGS.
This makes builiding with an optional 32 bit target simpler. For
instance Redis (that contains an embedded copy of hiredis) when compiled
with "make 32bit" uses to pass an ARCH parameter to force an hiredis
32 bit build.
2012-08-21 14:29:49 +02:00
Pieter Noordhuis
f9a3229873 Fix gprof target 2011-06-19 13:13:39 +02:00
Pieter Noordhuis
54a10a27e7 Coverage report 2011-06-19 13:07:12 +02:00
Pieter Noordhuis
be5e943ddd Use CFLAGS and LDFLAGS instead of custom variables 2011-06-19 12:37:45 +02:00
Pieter Noordhuis
cc8ed7360e Append to REAL_LDFLAGS so LDFLAGS can be overridden by the user 2011-06-19 12:34:41 +02:00
Pieter Noordhuis
608e29b375 Pass LDFLAGS to linker when creating dynamic library 2011-06-19 12:33:51 +02:00
Pieter Noordhuis
ff09caa04a Remove unnecessary overrides 2011-06-19 12:16:47 +02:00
Pieter Noordhuis
888b90d6ea Don't pass CFLAGS when linking 2011-06-19 10:21:05 +02:00
Pieter Noordhuis
3331c22eb9 Add phony target 2011-06-18 17:30:59 +02:00
Pieter Noordhuis
b8e0edaabb Remove unused variables
The variable OBJARCH was used to compile objects for both 32-bit and
64-bit architectures. It can be removed because this is only relevant
for the Ruby wrapper for hiredis. This wrapper should put these flags in
CFLAGS to get the same effect.
2011-06-18 17:18:10 +02:00
Pieter Noordhuis
0c2de2525e Swap arguments 2011-06-18 17:17:48 +02:00
Pieter Noordhuis
58ebe7acbd Merge DEBUG in REAL_CFLAGS 2011-06-18 17:17:15 +02:00
Pieter Noordhuis
fc810f77d3 Allow *extra* CFLAGS/LDFLAGS via arguments 2011-06-18 17:15:41 +02:00
Pieter Noordhuis
7a9127c938 Move redirection around 2011-06-18 16:46:18 +02:00
Pieter Noordhuis
722c142801 Disallow overriding CFLAGS and LDFLAGS 2011-06-18 16:42:55 +02:00
Pieter Noordhuis
461110e809 Move path variables closer to install target 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
b2bf7ba8c0 Move defaults outside if block 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
93329c467e Library variables may not be overridden 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
2ccb6e58ef Merge CCLINK with LDFLAGS 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
367ac44ac1 Remove private feature macros for Solaris from compiler flags 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
2cd46456c0 Add myself to Makefile license 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
8ee630875a Remove unused libraries from link flags 2011-06-18 16:28:57 +02:00
Pieter Noordhuis
d7dc9ca7c9 Fallback to gcc when $CC is not in $PATH 2011-06-18 16:28:52 +02:00
Pieter Noordhuis
7a8de1fe25 Exit with a non-zero status when tests failed 2011-05-29 10:03:39 -07:00
Pieter Noordhuis
82ad944412 Test against unix socket connection in make check target 2011-05-22 16:35:20 +02:00
Piotr Sikora
5793b999a9 Add "make check" target (useful for automated tests).
While there, add "-p" option to "hiredis-test", so that we could run
tests without interrupting Redis instance running on the default port.
2011-05-22 15:24:11 +02:00