[libvirt PATCH 002/351] meson: remove automake specific directives

EXTRA_DIST is not relevant because meson makes a git copy when creating dist archive so everything tracked by git is part of dist tarball. BUILD_SOURCES is not relevant as all dependencies should be explicitly tracked. The remaining ones are not converted to meson files as they are automatically tracked by meson. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- Makefile.am | 62 +---------- docs/Makefile.am | 51 --------- examples/Makefile.am | 8 -- include/libvirt/Makefile.am | 2 - po/Makefile.am | 7 -- src/Makefile.am | 55 ---------- src/access/Makefile.inc.am | 18 --- src/admin/Makefile.inc.am | 12 -- src/bhyve/Makefile.inc.am | 9 -- src/cpu_map/Makefile.inc.am | 2 - src/esx/Makefile.inc.am | 14 --- src/hyperv/Makefile.inc.am | 13 --- src/interface/Makefile.inc.am | 7 -- src/libxl/Makefile.inc.am | 10 -- src/locking/Makefile.inc.am | 26 ----- src/logging/Makefile.inc.am | 16 --- src/lxc/Makefile.inc.am | 15 --- src/network/Makefile.inc.am | 9 -- src/node_device/Makefile.inc.am | 7 -- src/nwfilter/Makefile.inc.am | 5 - src/openvz/Makefile.inc.am | 2 - src/qemu/Makefile.inc.am | 20 ---- src/remote/Makefile.inc.am | 31 ------ src/rpc/Makefile.inc.am | 25 ----- src/secret/Makefile.inc.am | 5 - src/security/Makefile.inc.am | 14 --- src/storage/Makefile.inc.am | 20 ---- src/test/Makefile.inc.am | 5 - src/util/Makefile.inc.am | 8 -- src/vbox/Makefile.inc.am | 11 -- src/vmware/Makefile.inc.am | 2 - src/vmx/Makefile.inc.am | 2 - src/vz/Makefile.inc.am | 2 - tests/Makefile.am | 187 -------------------------------- tools/Makefile.am | 47 -------- 35 files changed, 1 insertion(+), 728 deletions(-) diff --git a/Makefile.am b/Makefile.am index ad1edee76f4..310a9d90276 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,54 +31,6 @@ export XZ_OPT ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = \ - config-post.h \ - libvirt.spec libvirt.spec.in \ - mingw-libvirt.spec.in \ - libvirt.pc.in \ - libvirt-qemu.pc.in \ - libvirt-lxc.pc.in \ - libvirt-admin.pc.in \ - Makefile.nonreentrant \ - autogen.sh \ - GNUmakefile \ - run.in \ - README.rst \ - AUTHORS.in \ - CONTRIBUTING.rst \ - NEWS.rst \ - scripts/apibuild.py \ - scripts/augeas-gentest.py \ - build-aux/check-spacing.pl \ - scripts/check-aclperms.py \ - scripts/check-aclrules.py \ - scripts/check-drivername.py \ - scripts/check-driverimpls.py \ - scripts/check-file-access.py \ - scripts/check-remote-protocol.py \ - scripts/check-symfile.py \ - scripts/check-symsorting.py \ - scripts/dtrace2systemtap.py \ - scripts/esx_vi_generator.py \ - scripts/genaclperms.py \ - scripts/genpolkit.py \ - scripts/gensystemtap.py \ - scripts/group-qemu-caps.py \ - scripts/header-ifdef.py \ - scripts/hvsupport.py \ - scripts/hyperv_wmi_generator.py \ - scripts/mock-noinline.py \ - scripts/prohibit-duplicate-header.py \ - scripts/test-wrap-argv.py \ - build-aux/syntax-check.mk \ - build-aux/useless-if-before-free \ - build-aux/vc-list-files \ - ci/Makefile \ - ci/build.sh \ - ci/list-images.sh \ - ci/prepare.sh \ - $(NULL) - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc @@ -93,7 +45,7 @@ check-local: all tests check-access: all @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) -cov: clean-cov +cov: $(MKDIR_P) $(top_builddir)/coverage $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ -d $(top_builddir)/src \ @@ -104,18 +56,6 @@ cov: clean-cov $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ --legend $(top_builddir)/coverage/libvirt.info -clean-cov: - rm -rf $(top_builddir)/coverage - -MAINTAINERCLEANFILES = .git-module-status - -BUILT_SOURCES = configmake.h -CLEANFILES = configmake.h - -distclean-local: clean-GNUmakefile -clean-GNUmakefile: - test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile - dist-hook: gen-AUTHORS .PHONY: gen-AUTHORS diff --git a/docs/Makefile.am b/docs/Makefile.am index a480123e33f..6d4fcdc831a 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -53,16 +53,6 @@ vpathhack: test -e $$file || ln -s $(srcdir)/$$file $$file ; \ done -clean-local: - for dir in fonts js logos; \ - do \ - rm -f $$dir ; \ - done - for file in $(assets); \ - do \ - rm -f $$file ; \ - done - apihtml = \ html/index.html \ $(apihtml_generated) @@ -343,53 +333,15 @@ api_DATA = \ libvirt-lxc-api.xml \ libvirt-admin-api.xml -svg = \ - libvirt-daemon-arch.svg \ - libvirt-driver-arch.svg \ - libvirt-object-model.svg \ - migration-managed-direct.svg \ - migration-managed-p2p.svg \ - migration-native.svg \ - migration-tunnel.svg \ - migration-unmanaged-direct.svg - schemadir = $(pkgdatadir)/schemas schema_DATA = $(wildcard $(srcdir)/schemas/*.rng) -EXTRA_DIST= \ - site.xsl subsite.xsl newapi.xsl page.xsl \ - $(dot_html_in) $(dot_rst) $(apipng) \ - $(svg) $(assets) \ - $(javascript) $(logofiles) \ - $(internals_html_in) $(internals_rst) $(fonts) \ - $(kbase_html_in) $(kbase_rst) \ - $(manpages_rst) \ - aclperms.htmlinc \ - $(schema_DATA) - acl_generated = aclperms.htmlinc aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(top_srcdir)/scripts/genaclperms.py Makefile.am $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/genaclperms.py $< > $@ -CLEANFILES = \ - $(dot_html) \ - $(apihtml) \ - $(apiadminhtml) \ - $(apiqemuhtml) \ - $(apilxchtml) \ - $(internals_html) \ - $(kbase_html) \ - $(manpages_html) \ - $(man1_MANS) \ - $(man7_MANS) \ - $(manpages7_rst) \ - $(man8_MANS) \ - $(api_DATA) \ - $(dot_html_generated_in) \ - aclperms.htmlinc - timestamp="$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ then \ date -u --date="@$$SOURCE_DATE_EPOCH"; \ @@ -417,8 +369,6 @@ news.html.in: $(top_srcdir)/NEWS.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } -CLEANFILES += news.html.in - %.html.in: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } @@ -476,7 +426,6 @@ python_generated_files = $(api_DATA) APIBUILD=$(top_srcdir)/scripts/apibuild.py APIBUILD_STAMP=apibuild.py.stamp -CLEANFILES += $(APIBUILD_STAMP) $(python_generated_files): $(APIBUILD_STAMP) diff --git a/examples/Makefile.am b/examples/Makefile.am index ad635bdcc05..15ff897cf1f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -48,14 +48,6 @@ TEST_XML_EXAMPLES = \ $(wildcard $(srcdir)/xml/test/*.xml) \ $(NULL) -EXTRA_DIST = \ - $(POLKIT_EXAMPLES) \ - $(SH_EXAMPLES) \ - $(STORAGE_XML_EXAMPLES) \ - $(SYSTEMTAP_EXAMPLES) \ - $(TEST_XML_EXAMPLES) \ - $(NULL) - AM_CPPFLAGS = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am index d7114c34622..e447a5d37da 100644 --- a/include/libvirt/Makefile.am +++ b/include/libvirt/Makefile.am @@ -22,7 +22,5 @@ allheaders = $(wildcard $(srcdir)/*.h) virinc_HEADERS = $(filter-out $(srcdir)/libvirt-common.h, $(allheaders)) nodist_virinc_HEADERS = libvirt-common.h -EXTRA_DIST = libvirt-common.h.in - install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/po/Makefile.am b/po/Makefile.am index f0698b455ba..ff73ead6f72 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -14,13 +14,6 @@ POTFILE := $(DOMAIN).pot POFILES := $(LANGS:%=%.po) GMOFILES := $(LANGS:%=%.gmo) -CLEANFILES = $(GMOFILES) POTFILES - -EXTRA_DIST = \ - LINGUAS \ - $(POTFILES_IN) \ - $(POFILES) - if HAVE_GNU_GETTEXT_TOOLS XGETTEXT_ARGS = \ diff --git a/src/Makefile.am b/src/Makefile.am index 834e356b68b..c2bb7d0083b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,12 +48,6 @@ AM_LDFLAGS_MOD = \ $(AM_LDFLAGS) AM_LDFLAGS_MOD_NOUNDEF = $(AM_LDFLAGS_MOD) $(NO_UNDEFINED_LDFLAGS) -EXTRA_DIST = $(conf_DATA) - -BUILT_SOURCES = -CLEANFILES = -DISTCLEANFILES = -MAINTAINERCLEANFILES = nodist_conf_DATA = DRIVER_SOURCE_FILES = STATEFUL_DRIVER_SOURCE_FILES = @@ -145,15 +139,10 @@ moddir = $(libdir)/libvirt/connection-driver confdir = $(sysconfdir)/libvirt conf_DATA += libvirt.conf -CLEANFILES += $(nodist_conf_DATA) -BUILT_SOURCES += $(nodist_conf_DATA) - augeasdir = $(datadir)/augeas/lenses augeastestdir = $(datadir)/augeas/lenses/tests -CLEANFILES += $(augeastest_DATA) - # Internal generic driver infrastructure DATATYPES_SOURCES = datatypes.h datatypes.c DRIVER_SOURCES += \ @@ -252,7 +241,6 @@ else !WITH_REMOTE # re-generated when configured --without-remote. check-protocol: endif !WITH_REMOTE -EXTRA_DIST += $(PROTOCOL_STRUCTS) DRIVERS = \ $(srcdir)/driver-hypervisor.h \ @@ -392,15 +380,6 @@ else ! WITH_LIBSSH SYM_FILES += $(srcdir)/libvirt_libssh.syms endif ! WITH_LIBSSH -EXTRA_DIST += \ - libvirt_public.syms \ - libvirt_lxc.syms \ - libvirt_qemu.syms \ - $(SYM_FILES) \ - $(NULL) - -BUILT_SOURCES += $(GENERATED_SYM_FILES) - libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ $(ACCESS_DRIVER_SYM_FILES) \ $(top_builddir)/config.status @@ -450,9 +429,6 @@ libvirt_la_BUILT_LIBADD += libvirt_probes.lo libvirt_la_DEPENDENCIES += libvirt_probes.lo libvirt_probes.o nodist_libvirt_la_SOURCES = libvirt_probes.h -BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp - - tapsetdir = $(datadir)/systemtap/tapset tapset_DATA += libvirt_probes.stp libvirt_functions.stp @@ -489,12 +465,8 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemtap.py $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/dtrace2systemtap.py \ $(bindir) $(sbindir) $(libdir) $< > $@ -CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ - libvirt_functions.stp libvirt_probes.stp endif WITH_DTRACE_PROBES -EXTRA_DIST += libvirt_probes.d - libvirt_qemu_la_SOURCES = libvirt-qemu.c libvirt_qemu_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ @@ -515,10 +487,6 @@ libvirt_lxc_la_LDFLAGS = \ libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) libvirt_lxc_la_LIBADD = libvirt.la -EXTRA_DIST += \ - $(SYSCONF_FILES) \ - $(OPENRC_CONF_FILES) - install-sysconfig: $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig for f in $(SYSCONF_FILES:%.sysconf=%) ; \ @@ -557,11 +525,6 @@ uninstall-openrc-conf: LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%) -EXTRA_DIST += $(LOGROTATE_FILES_IN) - -BUILT_SOURCES += $(LOGROTATE_FILES) -CLEANFILES += $(LOGROTATE_FILES) - %.logrotate: remote/%.logrotate.in $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ @@ -587,20 +550,11 @@ UNINSTALL_LOCAL += uninstall-logrotate endif WITH_LIBVIRTD -EXTRA_DIST += \ - $(SYSTEMD_UNIT_FILES_IN) \ - $(OPENRC_INIT_FILES_IN) \ - $(NULL) - - if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system -BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) -DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) - install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) for f in $(SYSTEMD_UNIT_FILES); \ @@ -620,9 +574,6 @@ if LIBVIRT_INIT_SCRIPT_OPENRC OPENRC_INIT_DIR = $(sysconfdir)/init.d -BUILT_SOURCES += $(OPENRC_INIT_FILES) -DISTCLEANFILES += $(OPENRC_INIT_FILES) - install-openrc: $(OPENRC_INIT_FILES) install-openrc-conf $(MKDIR_P) $(DESTDIR)$(OPENRC_INIT_DIR) for f in $(OPENRC_INIT_FILES:%.init=%) ; \ @@ -671,9 +622,6 @@ libvirt_iohelper_CFLAGS = \ endif WITH_LIBVIRTD -generated-sources: $(BUILT_SOURCES) - - install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=install-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" @@ -688,6 +636,3 @@ uninstall-local: $(UNINSTALL_LOCAL) \ rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: - -CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s -DISTCLEANFILES += $(GENERATED_SYM_FILES) diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 11f87c6aa74..d58d5166bef 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -42,10 +42,6 @@ ACCESS_DRIVER_POLKIT_POLICY = access/org.libvirt.api.policy GENERATED_SYM_FILES += $(ACCESS_DRIVER_SYM_FILES) -EXTRA_DIST += \ - $(NULL) - - libvirt_driver_access_la_SOURCES = \ $(ACCESS_DRIVER_SOURCES) \ $(NULL) @@ -76,23 +72,9 @@ polkitactiondir = $(datadir)/polkit-1/actions if WITH_LIBVIRTD polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) endif WITH_LIBVIRTD - -CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) -BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) -else ! WITH_POLKIT -EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES) endif ! WITH_POLKIT -BUILT_SOURCES += \ - $(ACCESS_DRIVER_GENERATED) \ - $(ACCESS_DRIVER_API_FILES) \ - $(NULL) -CLEANFILES += \ - $(ACCESS_DRIVER_GENERATED) \ - $(ACCESS_DRIVER_API_FILES) \ - $(NULL) - libvirt_access.syms: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 8556a3b8523..2d94ead73e1 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -9,10 +9,6 @@ ADMIN_PROTOCOL_GENERATED = \ admin/admin_server_dispatch_stubs.h \ $(NULL) -EXTRA_DIST += $(ADMIN_PROTOCOL) -BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED) -CLEANFILES += $(ADMIN_PROTOCOL_GENERATED) - admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h noinst_LTLIBRARIES += libvirt_driver_admin.la @@ -44,14 +40,6 @@ GENERATED_SYM_FILES += admin/libvirt_admin.syms admin/libvirt_admin.def ADMIN_SYM_FILES = $(srcdir)/admin/libvirt_admin_private.syms -# admin/admin_remote.c is being included in admin/libvirt-admin.c, so we -# need to include it in the dist -EXTRA_DIST += \ - admin/admin_remote.c \ - admin/libvirt_admin_public.syms \ - $(ADMIN_SYM_FILES) \ - $(NULL) - conf_DATA += admin/libvirt-admin.conf lib_LTLIBRARIES += libvirt-admin.la diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 2536d12ab35..f75194fd3c8 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -25,8 +25,6 @@ BHYVE_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES)) -EXTRA_DIST += $(BHYVE_DRIVER_SOURCES) - if WITH_BHYVE noinst_LTLIBRARIES += libvirt_driver_bhyve_impl.la @@ -54,7 +52,6 @@ sbin_PROGRAMS += virtbhyved nodist_conf_DATA += bhyve/virtbhyved.conf augeas_DATA += bhyve/virtbhyved.aug augeastest_DATA += bhyve/test_virtbhyved.aug -CLEANFILES += bhyve/virtbhyved.aug virtbhyved_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtbhyved_SOURCES = $(REMOTE_DAEMON_GENERATED) @@ -98,9 +95,3 @@ bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@ endif WITH_BHYVE - -EXTRA_DIST += \ - bhyve/bhyve.conf \ - bhyve/libvirtd_bhyve.aug \ - bhyve/test_libvirtd_bhyve.aug.in \ - $(NULL) diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index 62403d2ed01..d3ccb880733 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -76,5 +76,3 @@ cpumap_DATA = \ cpu_map/x86_Westmere.xml \ cpu_map/x86_Westmere-IBRS.xml \ $(NULL) - -EXTRA_DIST += $(cpumap_DATA) diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index d53cef15150..89e7b18d344 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -40,22 +40,10 @@ ESX_DRIVER_GENERATED = \ esx/esx_vi.generated.h \ $(NULL) -ESX_DRIVER_EXTRA_DIST = \ - esx/README \ - esx/esx_vi_generator.input \ - $(NULL) - ESX_GENERATED_STAMP = .esx_vi_generator.stamp DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(ESX_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(ESX_DRIVER_SOURCES) \ - $(ESX_DRIVER_EXTRA_DIST) \ - $(NULL) - -BUILT_SOURCES += $(ESX_DRIVER_GENERATED) - $(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ @@ -64,8 +52,6 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(top_srcdir)/scripts/esx_vi_generator.py \ $(srcdir) $(builddir) && touch $@ -CLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) - if WITH_ESX USED_SYM_FILES += $(srcdir)/libvirt_esx.syms else ! WITH_ESX diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 672b42763ae..6e15f0682d9 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -21,19 +21,8 @@ HYPERV_DRIVER_GENERATED = \ HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp -HYPERV_DRIVER_EXTRA_DIST = \ - hyperv/hyperv_wmi_generator.input \ - $(NULL) - DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(HYPERV_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(HYPERV_DRIVER_SOURCES) \ - $(HYPERV_DRIVER_EXTRA_DIST) \ - $(NULL) - -BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED) - $(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ @@ -42,8 +31,6 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(top_srcdir)/scripts/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ -CLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) - if WITH_HYPERV noinst_LTLIBRARIES += libvirt_driver_hyperv.la libvirt_la_BUILT_LIBADD += libvirt_driver_hyperv.la diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 46a43e61db1..deff49fa65d 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -12,12 +12,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(INTERFACE_DRIVER_SOURCES) \ - $(INTERFACE_DRIVER_NETCF_SOURCES) \ - $(INTERFACE_DRIVER_UDEV_SOURCES) \ - $(NULL) - if WITH_INTERFACE mod_LTLIBRARIES += libvirt_driver_interface.la libvirt_driver_interface_la_CFLAGS = \ @@ -49,7 +43,6 @@ sbin_PROGRAMS += virtinterfaced nodist_conf_DATA += interface/virtinterfaced.conf augeas_DATA += interface/virtinterfaced.aug augeastest_DATA += interface/test_virtinterfaced.aug -CLEANFILES += interface/virtinterfaced.aug virtinterfaced_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtinterfaced_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 9037ba61ef3..db1f51e3ef8 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -24,9 +24,6 @@ LIBXL_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(LIBXL_DRIVER_SOURCES) \ - $(NULL) if WITH_LIBXL noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la @@ -60,7 +57,6 @@ sbin_PROGRAMS += virtxend nodist_conf_DATA += libxl/virtxend.conf augeas_DATA += libxl/virtxend.aug augeastest_DATA += libxl/test_virtxend.aug -CLEANFILES += libxl/virtxend.aug virtxend_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtxend_SOURCES = $(REMOTE_DAEMON_GENERATED) @@ -155,9 +151,3 @@ uninstall-data-libxl: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: endif WITH_LIBXL - -EXTRA_DIST += \ - libxl/libxl.conf \ - libxl/libvirtd_libxl.aug \ - libxl/test_libvirtd_libxl.aug.in \ - $(NULL) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index ab01d8e0482..ab0822dda35 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -41,32 +41,6 @@ LOCK_DAEMON_SOURCES = \ locking/lock_daemon_dispatch.h \ $(NULL) -EXTRA_DIST += \ - $(LOCK_PROTOCOL) \ - $(LOCK_DAEMON_SOURCES) \ - $(LOCK_DRIVER_LOCKD_SOURCES) \ - $(LOCK_DRIVER_SOURCES) \ - locking/sanlock.conf \ - locking/libvirt_sanlock.aug \ - locking/test_libvirt_sanlock.aug.in \ - locking/lockd.conf \ - locking/libvirt_lockd.aug \ - locking/test_libvirt_lockd.aug.in \ - locking/virtlockd.aug \ - locking/virtlockd.conf \ - locking/test_virtlockd.aug.in \ - $(NULL) - -BUILT_SOURCES += \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) - -CLEANFILES += \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ - $(NULL) - RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x SYSCONF_FILES += locking/virtlockd.sysconf diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 873e6029dd5..74987c63845 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -27,22 +27,6 @@ LOG_DAEMON_SOURCES = \ LOG_PROTOCOL = $(srcdir)/logging/log_protocol.x -EXTRA_DIST += \ - $(LOG_PROTOCOL) \ - $(LOG_DAEMON_SOURCES) \ - logging/virtlogd.aug \ - logging/virtlogd.conf \ - logging/test_virtlogd.aug.in \ - $(NULL) -BUILT_SOURCES += \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES += \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ - $(NULL) - SYSCONF_FILES += logging/virtlogd.sysconf VIRTLOGD_UNIT_FILES_IN = \ diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index b8c2e1eb3db..c9201110071 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -66,14 +66,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \ $(LXC_MONITOR_PROTOCOL_GENERATED) \ $(LXC_MONITOR_GENERATED) \ $(addprefix $(srcdir)/,$(LXC_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(LXC_DRIVER_SOURCES) \ - $(LXC_MONITOR_PROTOCOL) \ - $(LXC_CONTROLLER_SOURCES) \ - $(NULL) - -BUILT_SOURCES += $(LXC_GENERATED) -CLEANFILES += $(LXC_GENERATED) if WITH_LXC @@ -124,7 +116,6 @@ sbin_PROGRAMS += virtlxcd nodist_conf_DATA += lxc/virtlxcd.conf augeas_DATA += lxc/virtlxcd.aug augeastest_DATA += lxc/test_virtlxcd.aug -CLEANFILES += lxc/virtlxcd.aug virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED) @@ -285,9 +276,3 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ install-data-lxc \ uninstall-data-lxc \ $(NULL) - -EXTRA_DIST += \ - lxc/lxc.conf \ - lxc/libvirtd_lxc.aug \ - lxc/test_libvirtd_lxc.aug.in \ - $(NULL) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 196a30e16cd..9a1a3717073 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -20,12 +20,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(NETWORK_DRIVER_SOURCES) \ - $(NETWORK_DRIVER_PLATFORM_INC) \ - $(NETWORK_LEASES_HELPER_SOURCES) \ - $(NULL) - if WITH_NETWORK @@ -57,7 +51,6 @@ sbin_PROGRAMS += virtnetworkd nodist_conf_DATA += network/virtnetworkd.conf augeas_DATA += network/virtnetworkd.aug augeastest_DATA += network/test_virtnetworkd.aug -CLEANFILES += network/virtnetworkd.aug virtnetworkd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtnetworkd_SOURCES = $(REMOTE_DAEMON_GENERATED) @@ -189,8 +182,6 @@ endif WITH_FIREWALLD_ZONE endif WITH_NETWORK -EXTRA_DIST += network/default.xml network/libvirt.zone - .PHONY: \ install-data-network \ uninstall-data-network \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index f0f419317f9..8a8bbea01e9 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -25,12 +25,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \ $(NULL) -EXTRA_DIST += \ - $(NODE_DEVICE_DRIVER_SOURCES) \ - $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ - $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ - $(NULL) - if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals @@ -75,7 +69,6 @@ sbin_PROGRAMS += virtnodedevd nodist_conf_DATA += node_device/virtnodedevd.conf augeas_DATA += node_device/virtnodedevd.aug augeastest_DATA += node_device/test_virtnodedevd.aug -CLEANFILES += node_device/virtnodedevd.aug virtnodedevd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtnodedevd_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 20db8090e06..758370e1a74 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -2,8 +2,6 @@ NWFILTER_XML_FILES = $(wildcard $(srcdir)/nwfilter/xml/*.xml) -EXTRA_DIST += $(NWFILTER_XML_FILES) - NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h \ nwfilter/nwfilter_driver.c \ @@ -22,8 +20,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) -EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) - if WITH_NWFILTER nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter @@ -58,7 +54,6 @@ sbin_PROGRAMS += virtnwfilterd nodist_conf_DATA += nwfilter/virtnwfilterd.conf augeas_DATA += nwfilter/virtnwfilterd.aug augeastest_DATA += nwfilter/test_virtnwfilterd.aug -CLEANFILES += nwfilter/virtnwfilterd.aug virtnwfilterd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtnwfilterd_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am index 7ceb4e6095e..65b750b35af 100644 --- a/src/openvz/Makefile.inc.am +++ b/src/openvz/Makefile.inc.am @@ -11,8 +11,6 @@ OPENVZ_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(OPENVZ_DRIVER_SOURCES)) -EXTRA_DIST += $(OPENVZ_DRIVER_SOURCES) - if WITH_OPENVZ noinst_LTLIBRARIES += libvirt_driver_openvz.la libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 9e1d6192f5e..5aee568ed90 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -82,7 +82,6 @@ QEMU_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES)) -EXTRA_DIST += $(QEMU_DRIVER_SOURCES) if WITH_QEMU noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la @@ -119,17 +118,9 @@ libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) if WITH_DTRACE_PROBES libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h -BUILT_SOURCES += libvirt_qemu_probes.h tapset_DATA += libvirt_qemu_probes.stp -CLEANFILES += \ - libvirt_qemu_probes.h \ - libvirt_qemu_probes.o \ - libvirt_qemu_probes.lo \ - libvirt_qemu_probes.stp \ - $(NULL) - endif WITH_DTRACE_PROBES sbin_PROGRAMS += virtqemud @@ -137,7 +128,6 @@ sbin_PROGRAMS += virtqemud nodist_conf_DATA += qemu/virtqemud.conf augeas_DATA += qemu/virtqemud.aug augeastest_DATA += qemu/test_virtqemud.aug -CLEANFILES += qemu/virtqemud.aug virtqemud_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtqemud_SOURCES = $(REMOTE_DAEMON_GENERATED) @@ -243,18 +233,8 @@ endif WITH_QEMU uninstall-data-qemu \ $(NULL) -EXTRA_DIST += \ - qemu/qemu.conf \ - qemu/libvirtd_qemu.aug \ - qemu/test_libvirtd_qemu.aug.in \ - qemu/THREADS.txt \ - libvirt_qemu_probes.d \ - $(NULL) - QEMU_SHIM_SOURCES = qemu/qemu_shim.c -EXTRA_DIST += $(QEMU_SHIM_SOURCES) - if WITH_QEMU bin_PROGRAMS += virt-qemu-run diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 80f4aad7828..165a7cced60 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -150,32 +150,6 @@ DRIVER_SOURCE_FILES += \ $(REMOTE_DRIVER_GENERATED) \ $(addprefix $(srcdir)/,$(REMOTE_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(REMOTE_DRIVER_PROTOCOL) \ - $(REMOTE_DRIVER_SOURCES) \ - $(REMOTE_DAEMON_SOURCES) \ - remote/test_libvirtd.aug.in \ - remote/libvirtd.aug.in \ - remote/libvirtd.conf.in \ - remote/libvirtd.policy \ - remote/libvirtd.rules \ - remote/libvirtd.sasl \ - remote/libvirtd.sysctl \ - $(NULL) - -# Needed to build libvirt.pot, so must be listed outside -# the WITH_REMOTE/WITH_LIBVIRTD conditionals -BUILT_SOURCES += \ - $(REMOTE_DRIVER_GENERATED) \ - $(REMOTE_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES += \ - $(REMOTE_DRIVER_GENERATED) \ - $(REMOTE_DAEMON_GENERATED) \ - remote/libvirtd.conf \ - remote/virtproxyd.conf \ - $(NULL) - if WITH_REMOTE noinst_LTLIBRARIES += libvirt_driver_remote.la libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la @@ -230,11 +204,6 @@ nodist_conf_DATA += \ remote/virtproxyd.conf \ $(NULL) -CLEANFILES += \ - remote/libvirtd.aug \ - remote/virtproxyd.aug \ - $(NULL) - libvirtd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_libvirtd_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 0e154d9c69d..fe23b17a62b 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -1,12 +1,5 @@ # vim: filetype=automake -EXTRA_DIST += \ - rpc/gendispatch.pl \ - rpc/genprotocol.pl \ - rpc/virnetprotocol.x \ - rpc/virkeepaliveprotocol.x \ - $(NULL) - VIR_NET_RPC_GENERATED = \ rpc/virnetprotocol.h \ rpc/virnetprotocol.c \ @@ -14,9 +7,6 @@ VIR_NET_RPC_GENERATED = \ rpc/virkeepaliveprotocol.c \ $(NULL) -BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) -CLEANFILES += $(VIR_NET_RPC_GENERATED) - noinst_LTLIBRARIES += \ libvirt-net-rpc.la \ libvirt-net-rpc-server.la \ @@ -49,11 +39,6 @@ libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h \ rpc/virnetsshsession.c \ $(NULL) -else ! WITH_SSH2 -EXTRA_DIST += \ - rpc/virnetsshsession.h \ - rpc/virnetsshsession.c \ - $(NULL) endif ! WITH_SSH2 if WITH_SASL @@ -61,11 +46,6 @@ libvirt_net_rpc_la_SOURCES += \ rpc/virnetsaslcontext.h \ rpc/virnetsaslcontext.c \ $(NULL) -else ! WITH_SASL -EXTRA_DIST += \ - rpc/virnetsaslcontext.h \ - rpc/virnetsaslcontext.c \ - $(NULL) endif ! WITH_SASL if WITH_LIBSSH @@ -73,11 +53,6 @@ libvirt_net_rpc_la_SOURCES += \ rpc/virnetlibsshsession.h \ rpc/virnetlibsshsession.c \ $(NULL) -else ! WITH_LIBSSH -EXTRA_DIST += \ - rpc/virnetlibsshsession.h \ - rpc/virnetlibsshsession.c \ - $(NULL) endif ! WITH_LIBSSH libvirt_net_rpc_la_CFLAGS = \ diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index a8390f82652..586e6e372fd 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -10,10 +10,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(SECRET_DRIVER_SOURCES) \ - $(NULL) - if WITH_SECRETS mod_LTLIBRARIES += libvirt_driver_secret.la @@ -35,7 +31,6 @@ sbin_PROGRAMS += virtsecretd nodist_conf_DATA += secret/virtsecretd.conf augeas_DATA += secret/virtsecretd.aug augeastest_DATA += secret/test_virtsecretd.aug -CLEANFILES += secret/virtsecretd.aug virtsecretd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtsecretd_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 5f2f4c8e2de..871245a035f 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -48,20 +48,6 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in -e 's|[@]libexecdir[@]|@libexecdir@|' \ $< > $@ -BUILT_SOURCES += $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) -CLEANFILES += $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES) - -EXTRA_DIST += \ - $(SECURITY_DRIVER_SELINUX_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) \ - $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN) \ - security/apparmor/TEMPLATE.qemu \ - security/apparmor/TEMPLATE.lxc \ - security/apparmor/libvirt-qemu \ - security/apparmor/libvirt-lxc \ - $(NULL) - libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) noinst_LTLIBRARIES += libvirt_security_manager.la libvirt_la_BUILT_LIBADD += libvirt_security_manager.la diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 5e98a7ef5c5..43010ee9664 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -92,25 +92,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(STORAGE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_FS_SOURCES) \ - $(STORAGE_FILE_FS_SOURCES) \ - $(STORAGE_DRIVER_LVM_SOURCES) \ - $(STORAGE_DRIVER_ISCSI_SOURCES) \ - $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) \ - $(STORAGE_DRIVER_SCSI_SOURCES) \ - $(STORAGE_DRIVER_MPATH_SOURCES) \ - $(STORAGE_DRIVER_DISK_SOURCES) \ - $(STORAGE_DRIVER_RBD_SOURCES) \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) \ - $(STORAGE_FILE_GLUSTER_SOURCES) \ - $(STORAGE_DRIVER_ZFS_SOURCES) \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ - $(STORAGE_HELPER_DISK_SOURCES) \ - $(NULL) - storagebackenddir = $(libdir)/libvirt/storage-backend storagebackend_LTLIBRARIES = @@ -149,7 +130,6 @@ sbin_PROGRAMS += virtstoraged nodist_conf_DATA += storage/virtstoraged.conf augeas_DATA += storage/virtstoraged.aug augeastest_DATA += storage/test_virtstoraged.aug -CLEANFILES += storage/virtstoraged.aug virtstoraged_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtstoraged_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am index b84ab520bb6..c209414745e 100644 --- a/src/test/Makefile.inc.am +++ b/src/test/Makefile.inc.am @@ -8,11 +8,6 @@ TEST_DRIVER_ASSETS = test/test-screenshot.png DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES)) -EXTRA_DIST += \ - $(TEST_DRIVER_SOURCES) \ - $(TEST_DRIVER_ASSETS) \ - $(NULL) - if WITH_TEST driver_test_asset_DATA = $(TEST_DRIVER_ASSETS) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index eca7e7e0a1e..ca25f983090 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -239,11 +239,6 @@ UTIL_SOURCES = \ $(NULL) -EXTRA_DIST += \ - $(srcdir)/keycodemapdb/data/keymaps.csv \ - $(srcdir)/keycodemapdb/tools/keymap-gen \ - $(NULL) - # Sync with docs/ KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 qnum KEYNAMES = linux osx win32 @@ -253,9 +248,6 @@ KEYTABLES = \ $(KEYNAMES:%=util/virkeynametable_%.h) \ $(NULL) -BUILT_SOURCES += $(KEYTABLES) -CLEANFILES += $(KEYTABLES) - UTIL_IO_HELPER_SOURCES = util/iohelper.c noinst_LTLIBRARIES += libvirt_util.la diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index c5c6d538e71..8acbdc84609 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -21,21 +21,11 @@ VBOX_DRIVER_SOURCES = \ vbox/vbox_XPCOMCGlue.h \ $(NULL) -VBOX_DRIVER_EXTRA_DIST = \ - vbox/vbox_tmpl.c \ - vbox/README \ - $(NULL) - DRIVER_SOURCE_FILES += \ $(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \ $(srcdir)/vbox/vbox_tmpl.c \ $(NULL) -EXTRA_DIST += \ - $(VBOX_DRIVER_SOURCES) \ - $(VBOX_DRIVER_EXTRA_DIST) \ - $(NULL) - if WITH_VBOX noinst_LTLIBRARIES += libvirt_driver_vbox_impl.la libvirt_driver_vbox_la_SOURCES = @@ -65,7 +55,6 @@ sbin_PROGRAMS += virtvboxd nodist_conf_DATA += vbox/virtvboxd.conf augeas_DATA += vbox/virtvboxd.aug augeastest_DATA += vbox/test_virtvboxd.aug -CLEANFILES += vbox/virtvboxd.aug virtvboxd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtvboxd_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am index 10057343a6f..3caa6340daf 100644 --- a/src/vmware/Makefile.inc.am +++ b/src/vmware/Makefile.inc.am @@ -9,8 +9,6 @@ VMWARE_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES)) -EXTRA_DIST += $(VMWARE_DRIVER_SOURCES) - if WITH_VMWARE noinst_LTLIBRARIES += libvirt_driver_vmware.la libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am index 429bdfe51ef..88df423fed5 100644 --- a/src/vmx/Makefile.inc.am +++ b/src/vmx/Makefile.inc.am @@ -5,8 +5,6 @@ VMX_SOURCES = \ vmx/vmx.h \ $(NULL) -EXTRA_DIST += $(VMX_SOURCES) - if WITH_VMX noinst_LTLIBRARIES += libvirt_vmx.la libvirt_la_BUILT_LIBADD += libvirt_vmx.la diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index f60f73bf06f..7782fd89d75 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -12,7 +12,6 @@ VZ_DRIVER_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) -EXTRA_DIST += $(VZ_DRIVER_SOURCES) if WITH_VZ @@ -44,7 +43,6 @@ sbin_PROGRAMS += virtvzd nodist_conf_DATA += vz/virtvzd.conf augeas_DATA += vz/virtvzd.aug augeastest_DATA += vz/test_virtvzd.aug -CLEANFILES += vz/virtvzd.aug virtvzd_SOURCES = $(REMOTE_DAEMON_SOURCES) nodist_virtvzd_SOURCES = $(REMOTE_DAEMON_GENERATED) diff --git a/tests/Makefile.am b/tests/Makefile.am index c87b12d28c3..1b384f3d0c2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -74,102 +74,6 @@ LDADDS = \ MOCKLIBS_LIBS = \ ../src/libvirt.la -EXTRA_DIST = \ - .valgrind.supp \ - bhyvexml2argvdata \ - bhyveargv2xmldata \ - bhyvexml2xmloutdata \ - capabilityschemadata \ - commanddata \ - cputestdata \ - domaincapsdata \ - domainbackupxml2xmlin \ - domainbackupxml2xmlout \ - domainconfdata \ - domainschemadata \ - fchostdata \ - genericxml2xmlindata \ - genericxml2xmloutdata \ - interfaceschemadata \ - libxlxml2domconfigdata \ - lxcconf2xmldata \ - lxcxml2xmldata \ - lxcxml2xmloutdata \ - networkxml2confdata \ - networkxml2firewalldata \ - networkxml2xmlin \ - networkxml2xmlout \ - networkxml2xmlupdatein \ - networkxml2xmlupdateout \ - nodedevschemadata \ - nodedevmdevctldata \ - virhostcpudata \ - nssdata \ - nwfilterxml2firewalldata \ - nwfilterxml2xmlin \ - nwfilterxml2xmlout \ - qemuagentdata \ - qemublocktestdata \ - qemucapabilitiesdata \ - qemucaps2xmloutdata \ - qemudomaincheckpointxml2xmlin \ - qemudomaincheckpointxml2xmlout \ - qemudomainsnapshotxml2xmlin \ - qemudomainsnapshotxml2xmlout \ - qemuhotplugtestcpus \ - qemuhotplugtestdevices \ - qemuhotplugtestdomains \ - qemumigparamsdata \ - qemumonitorjsondata \ - qemuxml2argvdata \ - qemuxml2xmloutdata \ - qemustatusxml2xmldata \ - qemumemlockdata \ - qemufirmwaredata \ - qemuvhostuserdata \ - secretxml2xmlin \ - securityselinuxhelperdata \ - securityselinuxlabeldata \ - storagepoolcapsschemadata \ - storagepoolschemadata \ - storagepoolxml2xmlin \ - storagepoolxml2xmlout \ - storagepoolxml2argvdata \ - storagevolschemadata \ - storagevolxml2argvdata \ - storagevolxml2xmlin \ - storagevolxml2xmlout \ - sysinfodata \ - test-lib.sh \ - vboxsnapshotxmldata \ - vircaps2xmldata \ - vircgroupdata \ - virconfdata \ - virfiledata \ - virjsondata \ - virmacmaptestdata \ - virmock.h \ - virmockstathelpers.c \ - virnetdaemondata \ - virnetdevtestdata \ - virnetdevopenvswitchdata \ - virnetworkportxml2xmldata \ - virnwfilterbindingxml2xmldata \ - virpcitestdata \ - virscsidata \ - virsh-uriprecedence \ - virusbtestdata \ - vmwareverdata \ - vmx2xmldata \ - xlconfigdata \ - xmconfigdata \ - xml2vmxdata \ - virsh-auth.xml \ - virstorageutildata \ - virfilecachedata \ - virresctrldata \ - $(NULL) - test_helpers = commandhelper ssh test_programs = virshtest sockettest \ virhostcputest virbuftest \ @@ -437,8 +341,6 @@ test_programs += \ eventtest \ virdrivermoduletest \ virdriverconnvalidatetest -else ! WITH_LIBVIRTD -EXTRA_DIST += $(libvirtd_test_scripts) endif ! WITH_LIBVIRTD test_programs += objecteventtest @@ -448,9 +350,6 @@ if WITH_LIBVIRTD test_scripts += virt-aa-helper-test endif WITH_LIBVIRTD endif WITH_SECDRIVER_APPARMOR -EXTRA_DIST += virt-aa-helper-test - -EXTRA_DIST += $(test_scripts) if WITH_LINUX check-access: file-access-clean @@ -463,9 +362,6 @@ file-access-clean: endif WITH_LINUX -EXTRA_DIST += \ - permitted_file_access.txt - if WITH_TESTS noinst_PROGRAMS = $(test_programs) $(test_helpers) noinst_LTLIBRARIES = $(test_libraries) @@ -533,10 +429,6 @@ libxlmock_la_SOURCES = \ libxlmock_la_CFLAGS = $(LIBXL_CFLAGS) $(LIBXML_CFLAGS) $(GLIB_CFLAGS) libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libxlmock_la_LIBADD = $(MOCKLIBS_LIBS) - -else ! WITH_LIBXL -EXTRA_DIST += xlconfigtest.c \ - xmconfigtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL QEMUMONITORTESTUTILS_SOURCES = \ @@ -707,24 +599,6 @@ qemuvhostusertest_SOURCES = \ virfilewrapper.c virfilewrapper.h \ $(NULL) qemuvhostusertest_LDADD = $(qemu_LDADDS) - -else ! WITH_QEMU -EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c \ - qemudomaincheckpointxml2xmltest.c qemudomainsnapshotxml2xmltest.c \ - testutilsqemu.c testutilsqemu.h \ - testutilsqemuschema.c testutilsqemuschema.h \ - qemumonitorjsontest.c qemuhotplugtest.c \ - qemuagenttest.c qemucapabilitiestest.c \ - qemucaps2xmltest.c qemucommandutiltest.c \ - qemumemlocktest.c qemucpumock.c testutilshostcpus.h \ - qemublocktest.c \ - qemumigparamstest.c \ - qemusecuritytest.c qemusecuritytest.h \ - qemusecuritymock.c \ - qemufirmwaretest.c \ - qemuvhostusertest.c \ - qemuhotplugmock.c \ - $(QEMUMONITORTESTUTILS_SOURCES) endif ! WITH_QEMU if WITH_LXC @@ -743,8 +617,6 @@ lxcconf2xmltest_SOURCES = \ lxcconf2xmltest.c testutilslxc.c testutilslxc.h \ testutils.c testutils.h lxcconf2xmltest_LDADD = $(lxc_LDADDS) -else ! WITH_LXC -EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h endif ! WITH_LXC if WITH_OPENVZ @@ -753,10 +625,7 @@ openvzutilstest_SOURCES = \ testutils.c testutils.h openvzutilstest_LDADD = $(LDADDS) \ ../src/libvirt_driver_openvz.la -else ! WITH_OPENVZ -EXTRA_DIST += openvzutilstest.c endif ! WITH_OPENVZ -EXTRA_DIST += openvzutilstest.conf if WITH_ESX esxutilstest_SOURCES = \ @@ -766,8 +635,6 @@ esxutilstest_LDADD = $(LDADDS) esxutilstest_CFLAGS = \ -I$(top_builddir)/src/esx \ $(AM_CFLAGS) -else ! WITH_ESX -EXTRA_DIST += esxutilstest.c endif ! WITH_ESX if WITH_VBOX @@ -776,8 +643,6 @@ vboxsnapshotxmltest_SOURCES = \ testutils.c testutils.h vbox_LDADDS = ../src/libvirt_driver_vbox_impl.la vboxsnapshotxmltest_LDADD = $(LDADDS) $(vbox_LDADDS) -else ! WITH_VBOX -EXTRA_DIST += vboxsnapshotxmltest.c endif ! WITH_VBOX if WITH_VMX @@ -790,8 +655,6 @@ xml2vmxtest_SOURCES = \ xml2vmxtest.c \ testutils.c testutils.h xml2vmxtest_LDADD = $(LDADDS) -else ! WITH_VMX -EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c endif ! WITH_VMX if WITH_VMWARE @@ -799,8 +662,6 @@ vmwarevertest_SOURCES = \ vmwarevertest.c \ testutils.c testutils.h vmwarevertest_LDADD = $(LDADDS) -else ! WITH_VMWARE -EXTRA_DIST += vmwarevertest.c endif ! WITH_VMWARE if WITH_BHYVE @@ -832,13 +693,6 @@ bhyveargv2xmltest_SOURCES = \ bhyveargv2xmltest.c \ testutils.c testutils.h bhyveargv2xmltest_LDADD = $(bhyve_LDADDS) -else ! WITH_BHYVE -EXTRA_DIST += \ - bhyvexml2argvtest.c \ - bhyveargv2xmltest.c \ - bhyvexml2xmltest.c \ - bhyvexml2argvmock.c \ - bhyveargv2xmlmock.c endif ! WITH_BHYVE networkxml2xmlupdatetest_SOURCES = \ @@ -866,9 +720,6 @@ networkxml2firewalltest_SOURCES = \ networkxml2firewalltest.c \ testutils.c testutils.h networkxml2firewalltest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) - -else ! WITH_NETWORK -EXTRA_DIST += networkxml2xmltest.c networkxml2conftest.c endif ! WITH_NETWORK if WITH_STORAGE_SHEEPDOG @@ -879,8 +730,6 @@ storagebackendsheepdogtest_LDADD = \ ../src/libvirt_storage_backend_sheepdog_priv.la \ ../src/libvirt_driver_storage_impl.la \ $(LDADDS) -else ! WITH_STORAGE_SHEEPDOG -EXTRA_DIST += storagebackendsheepdogtest.c endif ! WITH_STORAGE_SHEEPDOG nwfilterxml2xmltest_SOURCES = \ @@ -955,13 +804,6 @@ storagepoolxml2xmltest_LDADD = $(LDADDS) \ storagepoolcapstest_SOURCES = \ storagepoolcapstest.c testutils.h testutils.c storagepoolcapstest_LDADD = $(LDADDS) - -else ! WITH_STORAGE -EXTRA_DIST += storagevolxml2argvtest.c -EXTRA_DIST += virstorageutiltest.c -EXTRA_DIST += storagepoolxml2argvtest.c -EXTRA_DIST += storagepoolxml2xmltest.c -EXTRA_DIST += storagepoolcapstest.c endif ! WITH_STORAGE storagevolxml2xmltest_SOURCES = \ @@ -1137,8 +979,6 @@ virnettlscontexttest_SOURCES += pkix_asn1_tab.c virnettlscontexttest_LDADD += -ltasn1 virnettlssessiontest_SOURCES += pkix_asn1_tab.c virnettlssessiontest_LDADD += -ltasn1 -else ! HAVE_LIBTASN1 -EXTRA_DIST += pkix_asn1_tab.c endif ! HAVE_LIBTASN1 virtimetest_SOURCES = \ @@ -1265,9 +1105,6 @@ libvirfilemock_la_SOURCES = \ virfilemock.c libvirfilemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libvirfilemock_la_LIBADD = $(MOCKLIBS_LIBS) -else ! WITH_LINUX -EXTRA_DIST += vircaps2xmltest.c virnumamock.c virfilewrapper.c \ - virfilewrapper.h virresctrltest.c virfilemock.c endif ! WITH_LINUX if WITH_NSS @@ -1311,8 +1148,6 @@ nssguestlinktest_CFLAGS = \ -I$(top_srcdir)/tools/nss nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDFLAGS = $(NULL) -else ! WITH_NSS -EXTRA_DIST += nsstest.c nssmock.c nsslinktest.c endif ! WITH_NSS libvirdeterministichashmock_la_SOURCES = \ @@ -1334,10 +1169,6 @@ virnetdevopenvswitchtest_LDADD = $(LDADDS) test_programs += \ virmacmaptest \ virnetdevopenvswitchtest -else ! WITH_YAJL -EXTRA_DIST += \ - virmacmaptest.c \ - virnetdevopenvswitchtest.c endif ! WITH_YAJL virnetdevtest_SOURCES = \ @@ -1382,10 +1213,6 @@ libvirtestmock_la_LIBADD = \ $(MOCKLIBS_LIBS) \ $(PROBES_O) \ ../src/libvirt_util.la -else ! WITH_LINUX - EXTRA_DIST += virusbtest.c virusbmock.c \ - virnetdevbandwidthtest.c virnetdevbandwidthmock.c \ - virtestmock.c endif ! WITH_LINUX if WITH_DBUS @@ -1409,9 +1236,6 @@ virsystemdtest_SOURCES = \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD = $(LDADDS) $(DBUS_LIBS) - -else ! WITH_DBUS -EXTRA_DIST += virdbustest.c virdbusmock.c virsystemdtest.c endif ! WITH_DBUS viruritest_SOURCES = \ @@ -1458,8 +1282,6 @@ securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \ endif WITH_QEMU endif WITH_ATTR endif WITH_SECDRIVER_SELINUX -EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c \ - securityselinuxhelper.c virbuftest_SOURCES = \ virbuftest.c testutils.h testutils.c @@ -1553,19 +1375,10 @@ fchosttest_LDADD = $(LDADDS) scsihosttest_SOURCES = \ scsihosttest.c testutils.h testutils.c scsihosttest_LDADD = $(LDADDS) - -else ! WITH_LINUX -EXTRA_DIST += fchosttest.c -EXTRA_DIST += scsihosttest.c endif ! WITH_LINUX if WITH_LINUX virscsitest_SOURCES = \ virscsitest.c testutils.h testutils.c virscsitest_LDADD = $(LDADDS) - -else ! WITH_LINUX -EXTRA_DIST += virscsitest.c endif ! WITH_LINUX - -CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/tools/Makefile.am b/tools/Makefile.am index eb8f269b486..0530e439a8b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -49,24 +49,6 @@ ICON_FILES = \ libvirt_win_icon_64x64.ico \ virsh_win_icon.rc -EXTRA_DIST = \ - $(ICON_FILES) \ - $(conf_DATA) \ - virt-xml-validate.in \ - virt-pki-validate.in \ - virt-sanlock-cleanup.in \ - libvirt-guests.sysconf \ - virt-login-shell.conf \ - virsh-edit.c \ - bash-completion/vsh \ - libvirt_recover_xattrs.sh \ - $(NULL) - - -CLEANFILES = -DISTCLEANFILES = -MAINTAINERCLEANFILES = - confdir = $(sysconfdir)/libvirt conf_DATA = @@ -76,7 +58,6 @@ libexec_SCRIPTS = libvirt-guests.sh if WITH_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup -DISTCLEANFILES += virt-sanlock-cleanup endif WITH_SANLOCK if WITH_LOGIN_SHELL @@ -139,20 +120,14 @@ VIRT_HOST_VALIDATE_BHYVE = \ virt-host-validate-bhyve.h if WITH_QEMU virt_host_validate_SOURCES += $(VIRT_HOST_VALIDATE_QEMU) -else ! WITH_QEMU -EXTRA_DIST += $(VIRT_HOST_VALIDATE_QEMU) endif ! WITH_QEMU if WITH_LXC virt_host_validate_SOURCES += $(VIRT_HOST_VALIDATE_LXC) -else ! WITH_LXC -EXTRA_DIST += $(VIRT_HOST_VALIDATE_LXC) endif ! WITH_LXC if WITH_BHYVE virt_host_validate_SOURCES += $(VIRT_HOST_VALIDATE_BHYVE) -else ! WITH_BHYVE -EXTRA_DIST += $(VIRT_HOST_VALIDATE_BHYVE) endif ! WITH_BHYVE virt_host_validate_LDFLAGS = \ @@ -260,7 +235,6 @@ virt_admin_LDADD = \ virt_admin_CFLAGS = \ $(AM_CFLAGS) \ $(READLINE_CFLAGS) -BUILT_SOURCES = if WITH_WIN_ICON virsh_LDADD += virsh_win_icon.$(OBJEXT) @@ -303,8 +277,6 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -EXTRA_DIST += libvirt-guests.sh.in - libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \ @@ -316,9 +288,7 @@ libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ -BUILT_SOURCES += libvirt-guests.sh -EXTRA_DIST += libvirt-guests.service.in SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -331,8 +301,6 @@ uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: -BUILT_SOURCES += libvirt-guests.service - else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: uninstall-systemd: @@ -372,8 +340,6 @@ uninstall-bash-completion: endif ! WITH_BASH_COMPLETION -EXTRA_DIST += wireshark/util/genxdrstub.pl - if WITH_WIRESHARK_DISSECTOR ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la @@ -514,16 +480,3 @@ lib_LTLIBRARIES = \ nss/libnss_libvirt_guest.la endif WITH_NSS - -EXTRA_DIST += $(LIBVIRT_NSS_SOURCES) \ - $(srcdir)/nss/libvirt_nss.syms \ - $(srcdir)/nss/libvirt_nss_bsd.syms \ - $(srcdir)/nss/libvirt_guest_nss.syms - -clean-local: - -rm -rf wireshark/src/libvirt - -CLEANFILES += $(bin_SCRIPTS) -CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s - -DISTCLEANFILES += $(BUILT_SOURCES) -- 2.26.2