[libvirt] [PATCH 2/2] build: Rename security manager library

[Daniel P. Berrange]

On Thu, Aug 02, 2012 at 03:47:11PM +0200, Jiri Denemark wrote:
> Security manager is not a dynamically loadable driver. Let's avoid the
> confusion by renaming libvirt_driver_security library as
> libvirt_security_manager.
> ---
>  src/Makefile.am | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 2b09141..d74497d 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1159,22 +1159,22 @@ libvirt_driver_nwfilter_la_SOURCES = $(NWFILTER_DRIVER_SOURCES)
>  endif
>  
>  
> -libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
> -noinst_LTLIBRARIES += libvirt_driver_security.la
> -libvirt_la_BUILT_LIBADD += libvirt_driver_security.la
> -libvirt_driver_security_la_CFLAGS = \
> +libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
> +noinst_LTLIBRARIES += libvirt_security_manager.la
> +libvirt_la_BUILT_LIBADD += libvirt_security_manager.la
> +libvirt_security_manager_la_CFLAGS = \
>  		-I$(top_srcdir)/src/conf $(AM_CFLAGS)
> -libvirt_driver_security_la_LDFLAGS = $(AM_LDFLAGS)
> -libvirt_driver_security_la_LIBADD =
> +libvirt_security_manager_la_LDFLAGS = $(AM_LDFLAGS)
> +libvirt_security_manager_la_LIBADD =
>  if WITH_SECDRIVER_SELINUX
> -libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
> -libvirt_driver_security_la_CFLAGS += $(SELINUX_CFLAGS)
> -libvirt_driver_security_la_LIBADD += $(SELINUX_LIBS)
> +libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES)
> +libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS)
> +libvirt_security_manager_la_LIBADD += $(SELINUX_LIBS)
>  endif
>  if WITH_SECDRIVER_APPARMOR
> -libvirt_driver_security_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
> -libvirt_driver_security_la_CFLAGS += $(APPARMOR_CFLAGS)
> -libvirt_driver_security_la_LIBADD += $(APPARMOR_LIBS)
> +libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES)
> +libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS)
> +libvirt_security_manager_la_LIBADD += $(APPARMOR_LIBS)
>  endif
>  
>  # Add all conditional sources just in case...
> @@ -1611,7 +1611,7 @@ libvirt_lxc_LDADD =			\
>  		$(NUMACTL_LIBS) \
>  		libvirt-net-rpc-server.la \
>  		libvirt-net-rpc.la \
> -		libvirt_driver_security.la \
> +		libvirt_security_manager.la \
>  		libvirt_conf.la \
>  		libvirt_util.la \
>  		../gnulib/lib/libgnu.la

ACK


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|