LP#1704116: fix intermittant failure of parallel building

[opensrf-equinox.git] / src / libopensrf / Makefile.am

diff --git a/src/libopensrf/Makefile.am b/src/libopensrf/Makefile.am
index 6c8c723..fd3729b 100644 (file)
--- a/src/libopensrf/Makefile.am
+++ b/src/libopensrf/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Equinox Software, Inc.
+# Copyright (C) 2008-2012 Equinox Software, Inc., and others
 # Kevin Beswick <kevinbeswick00@gmail.com>
 #
 # This program is free software; you can redistribute it and/or
@@ -14,7 +14,7 @@
 
 AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS  -DOSRF_STRICT_PARAMS -rdynamic -fno-strict-aliasing -DOSRF_JSON_ENABLE_XML_UTILS
 AM_LDFLAGS = $(DEF_LDFLAGS) -R $(libdir)
-LDADD = -lxml2 -ldl -lmemcache -lopensrf
+LDADD = -lopensrf
 
 DISTCLEANFILES = Makefile.in Makefile
 
@@ -65,12 +65,10 @@ TARGS_HEADS =        $(OSRF_INC)/transport_message.h \
                 $(OSRF_INC)/socket_bundle.h \
                 $(OSRF_INC)/sha.h \
                 $(OSRF_INC)/string_array.h \
-                $(OSRF_INC)/osrf_json_utils.h \
                 $(OSRF_INC)/osrf_json_xml.h 
 
 JSON_TARGS =                   osrf_json_object.c\
                                osrf_parse_json.c \
-                               osrf_json_parser.c \
                                osrf_json_tools.c \
                                osrf_legacy_json.c \
                                osrf_json_xml.c
@@ -102,6 +100,7 @@ opensrf_c_SOURCES = opensrf.c
 opensrf_c_DEPENDENCIES = libopensrf.la
 
 osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS)
+osrf_json_test_DEPENDENCIES = libopensrf.la
 
 noinst_LTLIBRARIES = libosrf_json.la
 lib_LTLIBRARIES = libopensrf.la
@@ -109,8 +108,9 @@ lib_LTLIBRARIES = libopensrf.la
 libosrf_json_la_SOURCES = $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS)
 libosrf_json_la_CFLAGS = $(AM_CFLAGS)
 
-libopensrf_la_CFLAGS = $(AM_CFLAGS)
+libopensrf_la_CFLAGS = $(AM_CFLAGS) $(memcached_CFLAGS)
 libopensrf_la_DEPENDENCIES = libosrf_json.la
+libopensrf_la_LIBADD = $(memcached_LIBS)
 
 libopensrf_la_SOURCES = $(TARGS) $(TARGS_HEADS) $(JSON_TARGS) $(JSON_TARGS_HEADS)
-
+libopensrf_la_LDFLAGS = -version-info 3:1:1