From 950c8b39169ecb16783a1ddc2744cfda303abbc4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 6 Jan 2009 15:16:43 +0000
Subject: [PATCH] dist: distribute all libvirt_*.syms files, ...

* src/Makefile.am (EXTRA_DIST): Distribute all libvirt_*.syms files,
not just those that happen to be selected at configure time.
---
 ChangeLog       |  6 ++++++
 src/Makefile.am | 22 ++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5647b4fe4..2ea5ba7fc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan  6 12:09:47 CET 2009 Jim Meyering <meyering@redhat.com>
+
+	dist: distribute all libvirt_*.syms files, ...
+	* src/Makefile.am (EXTRA_DIST): Distribute all libvirt_*.syms files,
+	not just those that happen to be selected at configure time.
+
 Tue Jan  6 10:47:33 CET 2009 Jim Meyering <meyering@redhat.com>
 
 	avoid syntax-check (po-check) failure due to FP match on gettext.m4
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f707e258d..b3020cc502 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,7 +192,7 @@ libvirt_driver_la_SOURCES =					\
 libvirt_driver_la_CFLAGS = $(XEN_CFLAGS) $(NUMACTL_CFLAGS)
 libvirt_driver_la_LDFLAGS = $(XEN_LIBS) $(NUMACTL_LIBS)
 
-PRIVSYMFILES = libvirt_private.syms
+USED_SYM_FILES = libvirt_private.syms
 
 if WITH_TEST
 if WITH_DRIVER_MODULES
@@ -412,31 +412,37 @@ EXTRA_DIST +=							\
 #
 
 if ENABLE_DEBUG
-PRIVSYMFILES += libvirt_debug.syms
+USED_SYM_FILES += libvirt_debug.syms
 endif
 
 if WITH_DRIVER_MODULES
-PRIVSYMFILES += libvirt_driver_modules.syms
+USED_SYM_FILES += libvirt_driver_modules.syms
 endif
 
 if WITH_BRIDGE
-PRIVSYMFILES += libvirt_bridge.syms
+USED_SYM_FILES += libvirt_bridge.syms
 endif
 
 if WITH_LINUX
-PRIVSYMFILES += libvirt_linux.syms
+USED_SYM_FILES += libvirt_linux.syms
 endif
 
-EXTRA_DIST += libvirt_public.syms $(PRIVSYMFILES)
+EXTRA_DIST += \
+  libvirt_public.syms		\
+  libvirt_private.syms		\
+  libvirt_debug.syms		\
+  libvirt_driver_modules.syms	\
+  libvirt_bridge.syms		\
+  libvirt_linux.syms
 
-libvirt.syms: libvirt_public.syms $(PRIVSYMFILES)
+libvirt.syms: libvirt_public.syms $(USED_SYM_FILES)
 	rm -f $@-tmp $@
 	printf '# WARNING: generated from the following:\n# $^\n\n' >$@-tmp
 	cat $(srcdir)/libvirt_public.syms >>$@-tmp
 	printf '\n\n# Private symbols\n\n' >>$@-tmp
 	printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n'  >>$@-tmp
 	printf 'global:\n\n' >>$@-tmp
-	for file in $(PRIVSYMFILES); do \
+	for file in $(USED_SYM_FILES); do \
 	    cat $(srcdir)/$$file >>$@-tmp; \
 	done
 	printf '\n\nlocal:\n*;\n\n};' >>$@-tmp