Rework mds/Makefile.am to support a dencoder client build

The patch adds all the mds sources to DENCODER_SOURCES to allow a
dencoder client build. The patch also splits the Makefile.am file to
better accomodate the change.

Refs: #10691

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/src/mds/Makefile-client.am b/src/mds/Makefile-client.am
new file mode 100644 (file)
index 0000000..0cfd8bf
--- /dev/null
+++ b/src/mds/Makefile-client.am
@@ -0,0 +1,4 @@
+# There are no libmds_types so use the full mds library for dencoder for now
+DENCODER_SOURCES += $(LIBMDS_SOURCES)
+
+DENCODER_DEPS += $(LIBMDS_DEPS)

diff --git a/src/mds/Makefile-server.am b/src/mds/Makefile-server.am
new file mode 100644 (file)
index 0000000..225a2d9
--- /dev/null
+++ b/src/mds/Makefile-server.am
@@ -0,0 +1,68 @@
+if WITH_MDS
+
+libmds_la_SOURCES = $(LIBMDS_SOURCES)
+libmds_la_LIBADD = $(LIBMDS_DEPS)
+noinst_LTLIBRARIES += libmds.la
+
+noinst_HEADERS += \
+       mds/inode_backtrace.h \
+       mds/flock.h \
+       mds/locks.c \
+       mds/locks.h \
+       mds/CDentry.h \
+       mds/CDir.h \
+       mds/CInode.h \
+       mds/Capability.h \
+       mds/InoTable.h \
+       mds/JournalPointer.h \
+       mds/LocalLock.h \
+       mds/Locker.h \
+       mds/LogEvent.h \
+       mds/LogSegment.h \
+       mds/MDBalancer.h \
+       mds/MDCache.h \
+       mds/RecoveryQueue.h \
+       mds/StrayManager.h \
+       mds/MDLog.h \
+       mds/MDS.h \
+       mds/Beacon.h \
+       mds/MDSContext.h \
+       mds/MDSAuthCaps.h \
+       mds/MDSMap.h \
+       mds/MDSTable.h \
+       mds/MDSTableServer.h \
+       mds/MDSTableClient.h \
+       mds/Mutation.h \
+       mds/Migrator.h \
+       mds/ScatterLock.h \
+       mds/Server.h \
+       mds/SessionMap.h \
+       mds/SimpleLock.h \
+       mds/SnapClient.h \
+       mds/SnapRealm.h \
+       mds/SnapServer.h \
+       mds/inode_backtrace.h \
+       mds/mds_table_types.h \
+       mds/mdstypes.h \
+       mds/snap.h \
+       mds/MDSContinuation.h
+
+noinst_HEADERS += \
+       mds/events/ECommitted.h \
+       mds/events/EExport.h \
+       mds/events/EFragment.h \
+       mds/events/EImportFinish.h \
+       mds/events/EImportStart.h \
+       mds/events/EMetaBlob.h \
+       mds/events/ENoOp.h \
+       mds/events/EOpen.h \
+       mds/events/EResetJournal.h \
+       mds/events/ESession.h \
+       mds/events/ESessions.h \
+       mds/events/ESlaveUpdate.h \
+       mds/events/ESubtreeMap.h \
+       mds/events/ETableClient.h \
+       mds/events/ETableServer.h \
+       mds/events/EUpdate.h
+
+endif # WITH_MDS

diff --git a/src/mds/Makefile.am b/src/mds/Makefile.am
index e62ab3f92dd5fa0be1e01ac78ec06b7afccfd062..f3e5215877140bb4ea3a1d7b73d31f2b4cad0396 100644 (file)
--- a/src/mds/Makefile.am
+++ b/src/mds/Makefile.am
@@ -1,7 +1,4 @@
-if ENABLE_SERVER
-if WITH_MDS
-
-libmds_la_SOURCES = \
+LIBMDS_SOURCES = \
        mds/Capability.cc \
        mds/MDS.cc \
        mds/Beacon.cc \
@@ -33,69 +30,12 @@ libmds_la_SOURCES = \
        mds/MDSAuthCaps.cc \
        mds/MDLog.cc \
        common/TrackedOp.cc
-libmds_la_LIBADD = $(LIBOSDC)
-noinst_LTLIBRARIES += libmds.la
+LIBMDS_DEPS = $(LIBOSDC)
 
-noinst_HEADERS += \
-       mds/inode_backtrace.h \
-       mds/flock.h \
-       mds/locks.c \
-       mds/locks.h \
-       mds/CDentry.h \
-       mds/CDir.h \
-       mds/CInode.h \
-       mds/Capability.h \
-       mds/InoTable.h \
-       mds/JournalPointer.h \
-       mds/LocalLock.h \
-       mds/Locker.h \
-       mds/LogEvent.h \
-       mds/LogSegment.h \
-       mds/MDBalancer.h \
-       mds/MDCache.h \
-       mds/RecoveryQueue.h \
-       mds/StrayManager.h \
-       mds/MDLog.h \
-       mds/MDS.h \
-       mds/Beacon.h \
-       mds/MDSContext.h \
-       mds/MDSAuthCaps.h \
-       mds/MDSMap.h \
-       mds/MDSTable.h \
-       mds/MDSTableServer.h \
-       mds/MDSTableClient.h \
-       mds/Mutation.h \
-       mds/Migrator.h \
-       mds/ScatterLock.h \
-       mds/Server.h \
-       mds/SessionMap.h \
-       mds/SimpleLock.h \
-       mds/SnapClient.h \
-       mds/SnapRealm.h \
-       mds/SnapServer.h \
-       mds/inode_backtrace.h \
-       mds/mds_table_types.h \
-       mds/mdstypes.h \
-       mds/snap.h \
-       mds/MDSContinuation.h
+if ENABLE_CLIENT
+include mds/Makefile-client.am
+endif
 
-noinst_HEADERS += \
-       mds/events/ECommitted.h \
-       mds/events/EExport.h \
-       mds/events/EFragment.h \
-       mds/events/EImportFinish.h \
-       mds/events/EImportStart.h \
-       mds/events/EMetaBlob.h \
-       mds/events/ENoOp.h \
-       mds/events/EOpen.h \
-       mds/events/EResetJournal.h \
-       mds/events/ESession.h \
-       mds/events/ESessions.h \
-       mds/events/ESlaveUpdate.h \
-       mds/events/ESubtreeMap.h \
-       mds/events/ETableClient.h \
-       mds/events/ETableServer.h \
-       mds/events/EUpdate.h
-
-endif # WITH_MDS
-endif # ENABLE_SERVER
+if ENABLE_SERVER
+include mds/Makefile-server.am
+endif