Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Work around problems with strict c89 mode on Sun Studio compilers

The test cases and the crc32.c file emits some warnings.

Change-Id: Ib3b7b909f4b7d753a95c76c8ab65de4b34382f38
Reviewed-on: http://review.couchbase.org/15154
Reviewed-by: Dustin Sallings <dustin@spy.net>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information...
commit 42dc254a38179ddcdcb48439ab301b37805027f8 1 parent 8ee02f4
@trondn trondn authored
Showing with 9 additions and 4 deletions.
  1. +9 −4 Makefile.am
View
13 Makefile.am
@@ -80,7 +80,7 @@ vbucket_get_master.3vbucket: docs/vbucket.pod
vbucket_get_replica.3vbucket: docs/vbucket.pod
${POD2MAN} -c "$*" -r "" -s 3lib $< $@
-noinst_LTLIBRARIES = libketama.la
+noinst_LTLIBRARIES = libketama.la libcrc32.la
lib_LTLIBRARIES = libvbucket.la
@@ -92,14 +92,17 @@ TESTS = ${check_PROGRAMS}
# Test application to test stuff from C
testapp_SOURCES = tests/testapp.c tests/macros.h
+testapp_CFLAGS = $(AM_CFLAGS) $(NO_WERROR)
testapp_DEPENDENCIES= libvbucket.la
testapp_LDADD= libvbucket.la
regression_SOURCES = tests/regression.c tests/macros.h
+regression_CFLAGS = $(AM_CFLAGS) $(NO_WERROR)
regression_DEPENDENCIES= libvbucket.la
regression_LDADD= libvbucket.la
testketama_SOURCES = tests/testketama.c tests/macros.h
+testketama_CFLAGS = $(AM_CFLAGS) $(NO_WERROR)
testketama_DEPENDENCIES= libvbucket.la libketama.la
testketama_LDADD= libvbucket.la libketama.la
@@ -109,8 +112,10 @@ EXTRA_DIST += tests/config
libketama_la_SOURCES = src/ketama.c
libketama_la_CFLAGS = $(AM_CFLAGS) ${NO_WERROR}
+libcrc32_la_SOURCES = src/crc32.c
+libcrc32_la_CFLAGS = $(AM_CFLAGS) ${NO_WERROR}
+
libvbucket_la_SOURCES= \
- src/crc32.c \
src/hash.h \
src/cJSON.c \
src/cJSON.h \
@@ -122,8 +127,8 @@ libvbucket_la_SOURCES= \
# http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
#
libvbucket_la_LDFLAGS= -version-info $(LIBVBUCKET_API_CURRENT):$(LIBVBUCKET_API_REVISION):$(LIBVBUCKET_API_AGE) -no-undefined
-libvbucket_la_LIBADD = libketama.la
-libvbucket_la_DEPENDENCIES = libketama.la
+libvbucket_la_LIBADD = libketama.la libcrc32.la
+libvbucket_la_DEPENDENCIES = libketama.la libcrc32.la
vbuckettool_SOURCES = src/vbuckettool.c
vbuckettool_DEPENDENCIES= libvbucket.la
Please sign in to comment.
Something went wrong with that request. Please try again.