diff options
Diffstat (limited to 'src/rgw/Makefile.am')
| -rw-r--r-- | src/rgw/Makefile.am | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index b92c35e08d6..c23f674d718 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -33,24 +33,26 @@ librgw_la_SOURCES = \ rgw/rgw_replica_log.cc \ rgw/rgw_keystone.cc \ rgw/rgw_quota.cc + librgw_la_CXXFLAGS = -Woverloaded-virtual ${AM_CXXFLAGS} noinst_LTLIBRARIES += librgw.la LIBRGW_DEPS += \ $(LIBRADOS) \ libcls_rgw_client.la \ - libcls_log_client.a \ - libcls_statelog_client.a \ - libcls_replica_log_client.a \ + libcls_log_client.la \ + libcls_statelog_client.la \ + libcls_replica_log_client.la \ libcls_lock_client.la \ libcls_refcount_client.la \ - libcls_version_client.a \ + libcls_version_client.la \ -lcurl \ -lexpat \ -lm \ -lfcgi -radosgw_SOURCES = \ +librgwprocess_la_SOURCES = \ + rgw/rgw_process.cc \ rgw/rgw_resolve.cc \ rgw/rgw_rest.cc \ rgw/rgw_rest_swift.cc \ @@ -59,16 +61,19 @@ radosgw_SOURCES = \ rgw/rgw_rest_user.cc \ rgw/rgw_rest_bucket.cc \ rgw/rgw_rest_metadata.cc \ - rgw/rgw_replica_log.cc \ rgw/rgw_rest_log.cc \ rgw/rgw_rest_opstate.cc \ rgw/rgw_rest_replica_log.cc \ rgw/rgw_rest_config.cc \ - rgw/rgw_http_client.cc \ rgw/rgw_swift.cc \ - rgw/rgw_swift_auth.cc \ + rgw/rgw_swift_auth.cc + +librgwprocess_la_CXXFLAGS = -Woverloaded-virtual ${AM_CXXFLAGS} +noinst_LTLIBRARIES += librgwprocess.la + +radosgw_SOURCES = \ rgw/rgw_main.cc -radosgw_LDADD = $(LIBRGW) $(LIBRGW_DEPS) -lresolv $(CEPH_GLOBAL) +radosgw_LDADD = $(LIBRGWPROCESS) $(LIBRGW) $(LIBRGW_DEPS) -lresolv $(CEPH_GLOBAL) bin_PROGRAMS += radosgw radosgw_admin_SOURCES = rgw/rgw_admin.cc @@ -150,3 +155,11 @@ noinst_HEADERS += \ rgw/rgw_bucket.h \ rgw/rgw_keystone.h + +libmod_rgw_la_LIBADD = $(LIBRGW) $(LIBRGW_DEPS) $(LIBRGWPROCESS) $(LIBRADOS) $(CEPH_GLOBAL) # $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) +# libmod_rgw_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex +libmod_rgw_la_SOURCES = rgw/mod_rgw.c +libmod_rgw_la_CFLAGS = ${AM_CFLAGS} -I/usr/include/apache2 -I/usr/include/apr-1.0 +lib_LTLIBRARIES += libmod_rgw.la +# libmod_rgwc_la_LDFLAGS = -module +# # mod_rgwc_la_LIBADD = libmod_rgwc.la |