Merge branch-2-1

[netatalk.git] / libatalk / cnid / cdb / Makefile.am

diff --git a/libatalk/cnid/cdb/Makefile.am b/libatalk/cnid/cdb/Makefile.am
index 6a04a541e61c03e47fb536b6261dc9b6eb8e77ae..cd3ca24fda0587571a63c6498934b8f12f1ce153 100644 (file)
--- a/libatalk/cnid/cdb/Makefile.am
+++ b/libatalk/cnid/cdb/Makefile.am
@@ -1,16 +1,7 @@
 # Makefile.am for libatalk/cnid/
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@
-
-noinst_LTLIBRARIES = libcnid_cdb.la
-if USE_CDB_BACKEND
-LIBS_db = @BDB_LIBS@
-else
-LIBS_db = 
-endif
-
 libcnid_cdb_la_SOURCES = cnid_cdb_add.c \
-                        cnid_cdb_close.c \
+                    cnid_cdb_close.c \
                         cnid_cdb_delete.c \
                         cnid_cdb_get.c \
                         cnid_cdb_lookup.c \
@@ -19,9 +10,12 @@ libcnid_cdb_la_SOURCES = cnid_cdb_add.c \
                         cnid_cdb_update.c \
                         cnid_cdb_rebuild_add.c \
                         cnid_cdb.h
+libcnid_cdb_la_CFLAGS = @BDB_CFLAGS@
+libcnid_cdb_la_LIBADD = @BDB_LIBS@ @PTHREAD_LIBS@
 
-noinst_HEADERS = cnid_cdb_meta.h cnid_cdb_private.h 
-
-libcnid_cdb_la_LIBADD = $(LIBS_db)
+if USE_CDB_BACKEND
+noinst_LTLIBRARIES = libcnid_cdb.la
+endif
 
+noinst_HEADERS = cnid_cdb_meta.h cnid_cdb_private.h 
 EXTRA_DIST = README cnid_cdb_meta.c cnid_cdb_nextid.c