summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-03-19 16:48:16 +0100
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-03-19 13:16:54 -0700
commite3f2ebfe6b621e84b0386d5a0613829241401d93 (patch)
tree03517f124c6735555782d79a833741fcf0d972bb
parent6f389fbb812b384bdd9bf4a20e86930505531996 (diff)
build: pass the correct CFLAGS and LDFLAGS when linking (to) libgfdb
Change-Id: Id9a7d0f457d9759ab7d0a52a4000b5ae36d211f8 BUG: 1194753 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/9946 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rw-r--r--libgfdb.pc.in3
-rw-r--r--libglusterfs/src/gfdb/Makefile.am4
-rw-r--r--xlators/features/changetimerecorder/src/Makefile.am5
3 files changed, 6 insertions, 6 deletions
diff --git a/libgfdb.pc.in b/libgfdb.pc.in
index 01b0381eff5..15871b92102 100644
--- a/libgfdb.pc.in
+++ b/libgfdb.pc.in
@@ -7,5 +7,6 @@ includedir=@includedir@
Name: libgfdb
Description: GlusterFS Database Library
Version: @LIBGFDB_VERSION@
-Libs: -L${libdir} -lgfchangedb -lglusterfs -lsqlite3
+Libs: -L${libdir} -lgfchangedb -lglusterfs
Cflags: -I${includedir}/glusterfs/gfdb
+Requires: sqlite3
diff --git a/libglusterfs/src/gfdb/Makefile.am b/libglusterfs/src/gfdb/Makefile.am
index 8c48463aed3..fdc11bf131a 100644
--- a/libglusterfs/src/gfdb/Makefile.am
+++ b/libglusterfs/src/gfdb/Makefile.am
@@ -1,11 +1,11 @@
libgfdb_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
- -DDATADIR=\"$(localstatedir)\"
+ $(SQLITE_CFLAGS) -DDATADIR=\"$(localstatedir)\"
libgfdb_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 -fpic \
-I$(top_srcdir)/libglusterfs/src \
-DDATADIR=\"$(localstatedir)\"
-libgfdb_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lsqlite3
+libgfdb_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(SQLITE_LIBS)
libgfdb_la_LDFLAGS = $(GF_LDFLAGS) -version-info $(LIBGLUSTERFS_LT_VERSION)
diff --git a/xlators/features/changetimerecorder/src/Makefile.am b/xlators/features/changetimerecorder/src/Makefile.am
index b124728076f..62664e8ebd4 100644
--- a/xlators/features/changetimerecorder/src/Makefile.am
+++ b/xlators/features/changetimerecorder/src/Makefile.am
@@ -8,8 +8,7 @@ changetimerecorder_la_SOURCES = changetimerecorder.c ctr-helper.c
changetimerecorder_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\
$(top_builddir)/libglusterfs/src/gfdb/libgfdb.la\
$(top_builddir)/api/src/libgfapi.la\
- $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la\
- -lsqlite3
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
noinst_HEADERS = changetimerecorder.h ctr_mem_types.h ctr-helper.h
@@ -20,6 +19,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
-I$(top_srcdir)/rpc/xdr/src \
-DDATADIR=\"$(localstatedir)\"
-AM_CFLAGS = -Wall $(GF_CFLAGS)
+AM_CFLAGS = -Wall $(GF_CFLAGS) $(SQLITE_CFLAGS)
CLEANFILES =