提交 a7f0db69 编写于 作者: M Martin Kletzander

Cleanup parameters for mock libraries

All the libraries use same parameters when building, why not have it in
one place at the begining of the Makefile.

This will also ensure no new mock library will have a problem with
missing e.g. MINGW_EXTRA_LDFLAGS.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>
上级 f58a3a51
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
## Copyright (C) 2005-2014 Red Hat, Inc. ## Copyright (C) 2005-2015 Red Hat, Inc.
## ##
## This library is free software; you can redistribute it and/or ## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public ## modify it under the terms of the GNU Lesser General Public
...@@ -47,6 +47,10 @@ AM_CFLAGS = \ ...@@ -47,6 +47,10 @@ AM_CFLAGS = \
AM_LDFLAGS = \ AM_LDFLAGS = \
-export-dynamic -export-dynamic
MOCKLIBS_LDFLAGS = -module -avoid-version \
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES
INCLUDES += \ INCLUDES += \
-DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\" -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\"
...@@ -552,9 +556,7 @@ qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS) $(LIBXML_LIBS) ...@@ -552,9 +556,7 @@ qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS) $(LIBXML_LIBS)
qemuxml2argvmock_la_SOURCES = \ qemuxml2argvmock_la_SOURCES = \
qemuxml2argvmock.c qemuxml2argvmock.c
qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS) qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS)
qemuxml2argvmock_la_LDFLAGS = -module -avoid-version \ qemuxml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
qemuxml2xmltest_SOURCES = \ qemuxml2xmltest_SOURCES = \
qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
...@@ -614,9 +616,7 @@ qemucaps2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) ...@@ -614,9 +616,7 @@ qemucaps2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
qemucaps2xmlmock_la_SOURCES = \ qemucaps2xmlmock_la_SOURCES = \
qemucaps2xmlmock.c qemucaps2xmlmock.c
qemucaps2xmlmock_la_CFLAGS = $(AM_CFLAGS) qemucaps2xmlmock_la_CFLAGS = $(AM_CFLAGS)
qemucaps2xmlmock_la_LDFLAGS = -module -avoid-version \ qemucaps2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
qemuagenttest_SOURCES = \ qemuagenttest_SOURCES = \
qemuagenttest.c \ qemuagenttest.c \
...@@ -723,9 +723,7 @@ if WITH_BHYVE ...@@ -723,9 +723,7 @@ if WITH_BHYVE
bhyvexml2argvmock_la_SOURCES = \ bhyvexml2argvmock_la_SOURCES = \
bhyvexml2argvmock.c bhyvexml2argvmock.c
bhyvexml2argvmock_la_CFLAGS = $(AM_CFLAGS) bhyvexml2argvmock_la_CFLAGS = $(AM_CFLAGS)
bhyvexml2argvmock_la_LDFLAGS = -module -avoid-version \ bhyvexml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
bhyve_LDADDS = ../src/libvirt_driver_bhyve_impl.la bhyve_LDADDS = ../src/libvirt_driver_bhyve_impl.la
if WITH_STORAGE if WITH_STORAGE
...@@ -932,9 +930,7 @@ virnetserverclienttest_LDADD = $(LDADDS) ...@@ -932,9 +930,7 @@ virnetserverclienttest_LDADD = $(LDADDS)
virnetserverclientmock_la_SOURCES = \ virnetserverclientmock_la_SOURCES = \
virnetserverclientmock.c virnetserverclientmock.c
virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS) virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS)
virnetserverclientmock_la_LDFLAGS = -module -avoid-version \ virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
if WITH_GNUTLS if WITH_GNUTLS
virnettlscontexttest_SOURCES = \ virnettlscontexttest_SOURCES = \
...@@ -1012,9 +1008,7 @@ virportallocatortest_LDADD = $(LDADDS) ...@@ -1012,9 +1008,7 @@ virportallocatortest_LDADD = $(LDADDS)
libvirportallocatormock_la_SOURCES = \ libvirportallocatormock_la_SOURCES = \
virportallocatortest.c virportallocatortest.c
libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1 libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1
libvirportallocatormock_la_LDFLAGS = -module -avoid-version \ libvirportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
vircgrouptest_SOURCES = \ vircgrouptest_SOURCES = \
vircgrouptest.c testutils.h testutils.c vircgrouptest.c testutils.h testutils.c
...@@ -1023,9 +1017,7 @@ vircgrouptest_LDADD = $(LDADDS) ...@@ -1023,9 +1017,7 @@ vircgrouptest_LDADD = $(LDADDS)
vircgroupmock_la_SOURCES = \ vircgroupmock_la_SOURCES = \
vircgroupmock.c vircgroupmock.c
vircgroupmock_la_CFLAGS = $(AM_CFLAGS) vircgroupmock_la_CFLAGS = $(AM_CFLAGS)
vircgroupmock_la_LDFLAGS = -module -avoid-version \ vircgroupmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
vircryptotest_SOURCES = \ vircryptotest_SOURCES = \
vircryptotest.c testutils.h testutils.c vircryptotest.c testutils.h testutils.c
...@@ -1044,9 +1036,7 @@ virpcimock_la_SOURCES = \ ...@@ -1044,9 +1036,7 @@ virpcimock_la_SOURCES = \
virpcimock_la_CFLAGS = $(AM_CFLAGS) virpcimock_la_CFLAGS = $(AM_CFLAGS)
virpcimock_la_LIBADD = $(GNULIB_LIBS) \ virpcimock_la_LIBADD = $(GNULIB_LIBS) \
../src/libvirt.la ../src/libvirt.la
virpcimock_la_LDFLAGS = -module -avoid-version \ virpcimock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
virnetdevtest_SOURCES = \ virnetdevtest_SOURCES = \
virnetdevtest.c testutils.h testutils.c virnetdevtest.c testutils.h testutils.c
...@@ -1058,9 +1048,7 @@ virnetdevmock_la_SOURCES = \ ...@@ -1058,9 +1048,7 @@ virnetdevmock_la_SOURCES = \
virnetdevmock_la_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) virnetdevmock_la_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS)
virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \
../src/libvirt.la ../src/libvirt.la
virnetdevmock_la_LDFLAGS = -module -avoid-version \ virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
if WITH_LINUX if WITH_LINUX
virusbtest_SOURCES = \ virusbtest_SOURCES = \
...@@ -1073,16 +1061,12 @@ virnetdevbandwidthtest_LDADD = $(LDADDS) $(LIBXML_LIBS) ...@@ -1073,16 +1061,12 @@ virnetdevbandwidthtest_LDADD = $(LDADDS) $(LIBXML_LIBS)
virusbmock_la_SOURCES = virusbmock.c virusbmock_la_SOURCES = virusbmock.c
virusbmock_la_CFLAGS = $(AM_CFLAGS) virusbmock_la_CFLAGS = $(AM_CFLAGS)
virusbmock_la_LDFLAGS = -module -avoid-version \ virusbmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
virnetdevbandwidthmock_la_SOURCES = \ virnetdevbandwidthmock_la_SOURCES = \
virnetdevbandwidthmock.c virnetdevbandwidthmock.c
virnetdevbandwidthmock_la_CFLAGS = $(AM_CFLAGS) virnetdevbandwidthmock_la_CFLAGS = $(AM_CFLAGS)
virnetdevbandwidthmock_la_LDFLAGS = -module -avoid-version \ virnetdevbandwidthmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
else ! WITH_LINUX else ! WITH_LINUX
EXTRA_DIST += virusbtest.c virusbmock.c \ EXTRA_DIST += virusbtest.c virusbmock.c \
...@@ -1098,9 +1082,7 @@ virdbustest_LDADD = $(LDADDS) $(DBUS_LIBS) ...@@ -1098,9 +1082,7 @@ virdbustest_LDADD = $(LDADDS) $(DBUS_LIBS)
virmockdbus_la_SOURCES = \ virmockdbus_la_SOURCES = \
virmockdbus.c virmockdbus.c
virmockdbus_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virmockdbus_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
virmockdbus_la_LDFLAGS = -module -avoid-version \ virmockdbus_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
virpolkittest_SOURCES = \ virpolkittest_SOURCES = \
virpolkittest.c testutils.h testutils.c virpolkittest.c testutils.h testutils.c
...@@ -1146,9 +1128,7 @@ endif ! WITH_TESTS ...@@ -1146,9 +1128,7 @@ endif ! WITH_TESTS
libsecurityselinuxhelper_la_SOURCES = \ libsecurityselinuxhelper_la_SOURCES = \
securityselinuxhelper.c securityselinuxhelper.c
libsecurityselinuxhelper_la_LDFLAGS = -module -avoid-version \ libsecurityselinuxhelper_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
securityselinuxtest_SOURCES = \ securityselinuxtest_SOURCES = \
securityselinuxtest.c testutils.h testutils.c securityselinuxtest.c testutils.h testutils.c
...@@ -1220,9 +1200,7 @@ endif WITH_LIBVIRTD ...@@ -1220,9 +1200,7 @@ endif WITH_LIBVIRTD
libshunload_la_SOURCES = shunloadhelper.c libshunload_la_SOURCES = shunloadhelper.c
libshunload_la_LIBADD = ../src/libvirt.la libshunload_la_LIBADD = ../src/libvirt.la
libshunload_la_LDFLAGS = -module -avoid-version \ libshunload_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS)
shunloadtest_SOURCES = \ shunloadtest_SOURCES = \
shunloadtest.c shunloadtest.c
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册