62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From c0cbeed281739194adfb9c43d01197a4f84d8d95 Mon Sep 17 00:00:00 2001
|
|
From: Richard Jones <rjones@redhat.com>
|
|
Date: Tue, 13 Oct 2009 11:18:49 +0100
|
|
Subject: [PATCH] Further changes to avoid using xenstore.
|
|
|
|
We missed two more places where libxenstore is used. This commit
|
|
changes the Makefiles to not link to xenstore when --without-xenstore
|
|
is given.
|
|
---
|
|
test/Makefile.am | 10 ++++++++--
|
|
vm-dump-metrics/Makefile.am | 5 ++++-
|
|
2 files changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/test/Makefile.am b/test/Makefile.am
|
|
index 42e6a59..fd2cd60 100644
|
|
--- a/test/Makefile.am
|
|
+++ b/test/Makefile.am
|
|
@@ -5,7 +5,10 @@ INCLUDES = \
|
|
noinst_PROGRAMS = test_static test_dyn
|
|
|
|
test_static_SOURCES = main.c
|
|
-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
|
|
+test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
|
|
+if WITH_XENSTORE
|
|
+test_static_LDADD += -lxenstore
|
|
+endif
|
|
|
|
test_static_DEPENDENCIES = \
|
|
../libmetrics/libmetrics.h \
|
|
@@ -13,7 +16,10 @@ test_static_DEPENDENCIES = \
|
|
|
|
test_dyn_SOURCES = main.c
|
|
test_dyn_CFLAGS = -DUSE_DL_OPEN
|
|
-test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
|
|
+test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
|
|
+if WITH_XENSTORE
|
|
+test_dyn_LDADD += -lxenstore
|
|
+endif
|
|
|
|
test_dyn_DEPENDENCIES = \
|
|
../libmetrics/libmetrics.h \
|
|
diff --git a/vm-dump-metrics/Makefile.am b/vm-dump-metrics/Makefile.am
|
|
index c29a4cd..0cde35d 100644
|
|
--- a/vm-dump-metrics/Makefile.am
|
|
+++ b/vm-dump-metrics/Makefile.am
|
|
@@ -8,8 +8,11 @@ endif
|
|
|
|
sbin_PROGRAMS = vm-dump-metrics
|
|
vm_dump_metrics_SOURCES = main.c
|
|
-vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -lxenstore
|
|
+vm_dump_metrics_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
|
|
vm_dump_metrics_LDFLAGS = -static
|
|
+if WITH_XENSTORE
|
|
+vm_dump_metrics_LDADD += -lxenstore
|
|
+endif
|
|
|
|
vm_dump_metrics_DEPENDENCIES = \
|
|
../libmetrics/libmetrics.h \
|
|
--
|
|
1.6.2.5
|
|
|