From: Boris Ranto <branto@redhat.com>
Date: Fri, 6 Mar 2015 16:26:33 +0000 (+0100)
Subject: Minor syntax fix-ups for Makefile.am redesign
X-Git-Tag: v0.94~27^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b3e1f09b6c0e6598bdff6e95a0c94115337740d;p=ceph.git

Minor syntax fix-ups for Makefile.am redesign
---

diff --git a/src/Makefile-client.am b/src/Makefile-client.am
index 2516c87e8e22..587bdf326aac 100644
--- a/src/Makefile-client.am
+++ b/src/Makefile-client.am
@@ -31,7 +31,7 @@ ceph: ceph.in ./ceph_ver.h Makefile
 if WITH_RADOS
 
 bash_completion_DATA += \
-	$(srcdir)/bash_completion/rados
+	$(srcdir)/bash_completion/rados \
 	$(srcdir)/bash_completion/radosgw-admin
 
 python_PYTHON += pybind/rados.py
@@ -43,7 +43,7 @@ bin_PROGRAMS += librados-config
 if WITH_RBD
 
 bash_completion_DATA += \
-	$(srcdir)/bash_completion/rbd \
+	$(srcdir)/bash_completion/rbd
 
 bin_SCRIPTS += \
 	ceph-rbdnamer \
diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am
index a313397cf001..bac67e902e02 100644
--- a/src/cls/Makefile.am
+++ b/src/cls/Makefile.am
@@ -1,7 +1,7 @@
 if ENABLE_CLIENT
-include Makefile-client.am
+include cls/Makefile-client.am
 endif
 
 if ENABLE_SERVER
-include Makefile-server.am
+include cls/Makefile-server.am
 endif
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 3ba5e95235d2..5f57ee0e3d75 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,6 +1,7 @@
 if ENABLE_CLIENT
 
 if WITH_RADOS
+
 rados_includedir = $(includedir)/rados
 rados_include_DATA = \
 	$(srcdir)/include/rados/librados.h \
@@ -11,7 +12,7 @@ rados_include_DATA = \
 	$(srcdir)/include/page.h \
 	$(srcdir)/include/crc32c.h \
 	$(srcdir)/include/memory.h
-endif # WITH_RADOS
+
 
 if WITH_RBD
 librbd_includedir = $(includedir)/rbd
@@ -21,6 +22,7 @@ librbd_include_DATA = \
 	$(srcdir)/include/rbd/librbd.hpp
 endif # WITH_RBD
 
+
 if WITH_RADOSSTRIPER
 radosstriper_includedir = $(includedir)/radosstriper
 radosstriper_include_DATA = \
@@ -28,13 +30,16 @@ radosstriper_include_DATA = \
 	$(srcdir)/include/radosstriper/libradosstriper.hpp
 endif # WITH_RADOSSTRIPER
 
+
 if WITH_CEPHFS
 libcephfs_includedir = $(includedir)/cephfs
 libcephfs_include_DATA = $(srcdir)/include/cephfs/libcephfs.h
 endif # WITH_CEPHFS
 
+
 endif # WITH_RADOS
 
+endif # ENABLE_CLIENT
 
 noinst_HEADERS += \
 	include/Context.h \
@@ -106,5 +111,3 @@ noinst_HEADERS += \
 	include/hash_namespace.h \
 	include/unordered_set.h \
 	include/unordered_map.h
-
-endif # ENABLE_CLIENT
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 7d30c6745492..851fe3aa6f66 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -2,11 +2,11 @@ include test/erasure-code/Makefile.am
 include test/messenger/Makefile.am
 
 if ENABLE_CLIENT
-include Makefile-client.am
+include test/Makefile-client.am
 endif
 
 if ENABLE_SERVER
-include Makefile-server.am
+include test/Makefile-server.am
 endif
 
 ## Unknown/other tests
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 5b725f4a0cd9..6633a271dd07 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,9 +1,9 @@
 if ENABLE_CLIENT
-include Makefile-client.am
+include tools/Makefile-client.am
 endif
 
 if ENABLE_SERVER
-include Makefile-server.am
+include tools/Makefile-server.am
 endif
 
 monmaptool_SOURCES = tools/monmaptool.cc