Permalink
Browse files

Added UUID_LIBS variable to LD_ADD of certain targets.

Will be set to '-luuid' or '' depending on function prototype found by test in
configure.ac.
  • Loading branch information...
1 parent 8eceb9e commit e9dbcfac5134a93ef257f97dfc1317505d15ba33 @davechallis committed Nov 2, 2011
Showing with 19 additions and 19 deletions.
  1. +16 −16 src/backend/Makefile.am
  2. +3 −3 src/utilities/Makefile.am
View
@@ -18,57 +18,57 @@ test: all
@diff /tmp/tstest/qbtest.txt exemplar/qbtest.txt && echo "PASS" || echo "FAIL"
4s_backend_SOURCES = server.c backend.c import-backend.c query-backend.c ../common/timing.c
-4s_backend_LDADD = lib4storage.a ../common/lib4sintl.a @MDNS_LIBS@
+4s_backend_LDADD = lib4storage.a ../common/lib4sintl.a @MDNS_LIBS@ @UUID_LIBS@
bctest_SOURCES = bctest.c ../common/timing.c
bctest_LDADD = lib4storage.a ../common/lib4sintl.a
treetest_SOURCES = treetest.c backend.c tree.c ../common/timing.c
-treetest_LDADD = lib4storage.a ../common/lib4sintl.a
+treetest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
rhashtest_SOURCES = rhashtest.c backend.c query-backend.c
-rhashtest_LDADD = lib4storage.a ../common/lib4sintl.a
+rhashtest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
mhashtest_SOURCES = mhashtest.c backend.c query-backend.c
-mhashtest_LDADD = lib4storage.a ../common/lib4sintl.a
+mhashtest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
ptreetest_SOURCES = ptreetest.c backend.c ../common/timing.c
-ptreetest_LDADD = lib4storage.a ../common/lib4sintl.a
+ptreetest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
ptabletest_SOURCES = ptabletest.c backend.c ../common/timing.c
-ptabletest_LDADD = lib4storage.a ../common/lib4sintl.a
+ptabletest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
tbchaintest_SOURCES = tbchaintest.c backend.c ../common/timing.c
-tbchaintest_LDADD = lib4storage.a ../common/lib4sintl.a
+tbchaintest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
listtest_SOURCES = listtest.c backend.c ../common/timing.c
-listtest_LDADD = lib4storage.a ../common/lib4sintl.a
+listtest_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
prefix_trie_test_SOURCES = prefix-trie.c prefix-trie-test.c
prefix_trie_test_LDADD = ../common/lib4sintl.a
bcdump_SOURCES = bcdump.c backend.c ../common/timing.c
-bcdump_LDADD = lib4storage.a ../common/lib4sintl.a
+bcdump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
treedump_SOURCES = treedump.c tree.c backend.c ../common/timing.c
-treedump_LDADD = lib4storage.a ../common/lib4sintl.a
+treedump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
listdump_SOURCES = listdump.c backend.c ../common/timing.c
-listdump_LDADD = lib4storage.a ../common/lib4sintl.a
+listdump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
rhashdump_SOURCES = rhashdump.c backend.c ../common/timing.c
-rhashdump_LDADD = lib4storage.a ../common/lib4sintl.a
+rhashdump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
mhashdump_SOURCES = mhashdump.c backend.c ../common/timing.c
-mhashdump_LDADD = lib4storage.a ../common/lib4sintl.a
+mhashdump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
ptreedump_SOURCES = ptreedump.c backend.c ../common/timing.c
-ptreedump_LDADD = lib4storage.a ../common/lib4sintl.a
+ptreedump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
ptreebind_SOURCES = ptreebind.c backend.c ../common/timing.c
-ptreebind_LDADD = lib4storage.a ../common/lib4sintl.a
+ptreebind_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
tbchaindump_SOURCES = tbchaindump.c backend.c ../common/timing.c
-tbchaindump_LDADD = lib4storage.a ../common/lib4sintl.a
+tbchaindump_LDADD = lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
lib4storage_a_SOURCES = chain.c bucket.c list.c tlist.c rhash.c mhash.c sort.c lock.c metadata.c disk-space.c ptree.c ptable.c tbchain.c prefix-trie.c
@@ -23,13 +23,13 @@ install-data-local:
4s_backend_copy_LDADD = ../common/lib4sintl.a ../backend/metadata.o ../common/datatypes.o
4s_backend_setup_SOURCES = backend-setup.c ../common/timing.c
-4s_backend_setup_LDADD = ../backend/backend.o ../backend/lib4storage.a ../common/lib4sintl.a @MDNS_LIBS@
+4s_backend_setup_LDADD = ../backend/backend.o ../backend/lib4storage.a ../common/lib4sintl.a @MDNS_LIBS@ @UUID_LIBS@
4s_rid_SOURCES = 4s-rid.c
4s_rid_LDADD = ../common/lib4sintl.a
4s_backend_info_SOURCES = backend-info.c ../common/timing.c ../common/gnu-options.c
-4s_backend_info_LDADD = ../backend/backend.o ../backend/lib4storage.a ../common/lib4sintl.a
+4s_backend_info_LDADD = ../backend/backend.o ../backend/lib4storage.a ../common/lib4sintl.a @UUID_LIBS@
4s_backend_passwd_SOURCES = passwd.c ../common/gnu-options.c
-4s_backend_passwd_LDADD = ../backend/backend.o ../backend/lib4storage.a ../common/lib4sintl.a
+4s_backend_passwd_LDADD = ../backend/backend.o ../backend/lib4storage.a ../common/lib4sintl.a @UUID_LIBS@

0 comments on commit e9dbcfa

Please sign in to comment.