|
 |
2edde3 |
From 2009a966d779240bc62f0877201aabd0cd59ac6f Mon Sep 17 00:00:00 2001
|
|
|
2edde3 |
From: Boris Ranto <branto@redhat.com>
|
|
|
2edde3 |
Date: Tue, 21 Feb 2017 13:49:01 +0100
|
|
|
2edde3 |
Subject: [PATCH] Makefile: Fix dencoder build
|
|
|
2edde3 |
|
|
|
2edde3 |
Signed-off-by: Boris Ranto <branto@redhat.com>
|
|
|
2edde3 |
---
|
|
|
2edde3 |
src/rgw/Makefile.am | 26 ++++----------------------
|
|
|
2edde3 |
1 file changed, 4 insertions(+), 22 deletions(-)
|
|
|
2edde3 |
|
|
|
2edde3 |
diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
|
|
|
2edde3 |
index b083dd1..a94e4e2 100644
|
|
|
2edde3 |
--- a/src/rgw/Makefile.am
|
|
|
2edde3 |
+++ b/src/rgw/Makefile.am
|
|
|
2edde3 |
@@ -1,25 +1,5 @@
|
|
|
2edde3 |
if ENABLE_CLIENT
|
|
|
2edde3 |
-
|
|
|
2edde3 |
-# inject rgw stuff in the decoder testcase
|
|
|
2edde3 |
-DENCODER_SOURCES += \
|
|
|
2edde3 |
- rgw/rgw_dencoder.cc \
|
|
|
2edde3 |
- rgw/rgw_acl.cc \
|
|
|
2edde3 |
- rgw/rgw_basic_types.cc \
|
|
|
2edde3 |
- rgw/rgw_common.cc \
|
|
|
2edde3 |
- rgw/rgw_env.cc \
|
|
|
2edde3 |
- rgw/rgw_json_enc.cc \
|
|
|
2edde3 |
- rgw/rgw_keystone.cc
|
|
|
2edde3 |
-
|
|
|
2edde3 |
-DENCODER_DEPS += -lcurl -lexpat \
|
|
|
2edde3 |
- libcls_version_client.la \
|
|
|
2edde3 |
- libcls_log_client.la \
|
|
|
2edde3 |
- libcls_refcount_client.la \
|
|
|
2edde3 |
- libcls_user_client.la \
|
|
|
2edde3 |
- libcls_timeindex_client.la \
|
|
|
2edde3 |
- libcls_statelog_client.la
|
|
|
2edde3 |
-
|
|
|
2edde3 |
if WITH_RADOS
|
|
|
2edde3 |
-if WITH_RADOSGW
|
|
|
2edde3 |
|
|
|
2edde3 |
librgw_la_SOURCES = \
|
|
|
2edde3 |
rgw/rgw_acl.cc \
|
|
|
2edde3 |
@@ -122,8 +102,9 @@ librgw_la_LIBADD = $(LIBRGW_DEPS) \
|
|
|
2edde3 |
|
|
|
2edde3 |
librgw_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
|
|
|
2edde3 |
|
|
|
2edde3 |
-lib_LTLIBRARIES += librgw.la
|
|
|
2edde3 |
+noinst_LTLIBRARIES += librgw.la
|
|
|
2edde3 |
|
|
|
2edde3 |
+if WITH_RADOSGW
|
|
|
2edde3 |
CIVETWEB_INCLUDE = --include $(srcdir)/civetweb/include/civetweb_conf.h
|
|
|
2edde3 |
|
|
|
2edde3 |
libcivetweb_la_SOURCES = \
|
|
|
2edde3 |
@@ -176,6 +157,8 @@ ceph_rgw_jsonparser_SOURCES = \
|
|
|
2edde3 |
ceph_rgw_jsonparser_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(CEPH_GLOBAL)
|
|
|
2edde3 |
bin_DEBUGPROGRAMS += ceph_rgw_jsonparser
|
|
|
2edde3 |
|
|
|
2edde3 |
+endif # WITH_RADOSGW
|
|
|
2edde3 |
+
|
|
|
2edde3 |
noinst_HEADERS += \
|
|
|
2edde3 |
rgw/rgw_acl.h \
|
|
|
2edde3 |
rgw/rgw_acl_s3.h \
|
|
|
2edde3 |
@@ -262,6 +245,5 @@ noinst_HEADERS += \
|
|
|
2edde3 |
civetweb/include/civetweb_conf.h \
|
|
|
2edde3 |
civetweb/src/md5.h
|
|
|
2edde3 |
|
|
|
2edde3 |
-endif # WITH_RADOSGW
|
|
|
2edde3 |
endif # WITH_RADOS
|
|
|
2edde3 |
endif # ENABLE_CLIENT
|
|
|
2edde3 |
--
|
|
|
2edde3 |
2.9.3
|
|
|
2edde3 |
|