[PR PATCH master v2 1/3] Makefile: Fix unconditional metad files in ENABLE_METADATA

[google]

From: Niklas Hambuechen <nikl...@google.com>

Since ENABLE_METADATA is optional, they should have their own
optional section, just like ENABLE_MOND does.
---
 Makefile.am | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 83d7df9..6b36fe7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -886,11 +886,6 @@ HS_LIB_SRCS = \
        src/Ganeti/Logging/Lifted.hs \
        src/Ganeti/Logging/WriterLog.hs \
        src/Ganeti/Luxi.hs \
-       src/Ganeti/Metad/Config.hs \
-       src/Ganeti/Metad/ConfigServer.hs \
-       src/Ganeti/Metad/Server.hs \
-       src/Ganeti/Metad/Types.hs \
-       src/Ganeti/Metad/WebServer.hs \
        src/Ganeti/Network.hs \
        src/Ganeti/Objects.hs \
        src/Ganeti/Objects/BitArray.hs \
@@ -969,6 +964,22 @@ else
 EXTRA_DIST += src/Ganeti/Monitoring/Server.hs
 endif
 
+if ENABLE_METADATA
+HS_LIB_SRCS += \
+       src/Ganeti/Metad/Config.hs \
+       src/Ganeti/Metad/ConfigServer.hs \
+       src/Ganeti/Metad/Server.hs \
+       src/Ganeti/Metad/Types.hs \
+       src/Ganeti/Metad/WebServer.hs
+else
+EXTRA_DIST += \
+       src/Ganeti/Metad/Config.hs \
+       src/Ganeti/Metad/ConfigServer.hs \
+       src/Ganeti/Metad/Server.hs \
+       src/Ganeti/Metad/Types.hs \
+       src/Ganeti/Metad/WebServer.hs
+endif
+
 HS_TEST_SRCS = \
        test/hs/Test/AutoConf.hs \
        test/hs/Test/Ganeti/Attoparsec.hs \
-- 
2.1.3