[libvirt PATCH] Remove references to deleted Makefile.am

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx>
---
 src/admin/libvirt_admin_private.syms | 2 +-
 src/libvirt_private.syms             | 2 +-
 src/libvirt_remote.syms              | 2 +-
 src/vbox/vbox_tmpl.c                 | 4 ----
 tests/testutils.h                    | 4 ++--
 tools/wireshark/README.rst           | 3 +--
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin_private.syms
index 157a45341e..d9f38a7155 100644
--- a/src/admin/libvirt_admin_private.syms
+++ b/src/admin/libvirt_admin_private.syms
@@ -1,6 +1,6 @@
 #
 # General private symbols for libvirt_admin. Add symbols here, and see
-# Makefile.am for more details.
+# src/admin/meson.build for more details.
 #
 # Keep this file sorted by header name, then by symbols with each header.
 #
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index cb9fe7c80a..123357b761 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1,5 +1,5 @@
 #
-# General private symbols. Add symbols here, and see Makefile.am for
+# General private symbols. Add symbols here, and see src/meson.build for
 # more details.
 #
 # Keep this file sorted by header name, then by symbols with each header.
diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index 605271bcb2..11c9e2cb73 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -1,6 +1,6 @@
 #
 # Private symbols used in RPC operations. Add symbols here, and see
-# Makefile.am for more details.
+# src/remote/meson.build for more details.
 #
 # Keep this file sorted by header name, then by symbols with each header.
 #
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index d37ffd9a6b..182d4c6b75 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -1,10 +1,6 @@
 /** @file vbox_tmpl.c
  * Template File to support multiple versions of VirtualBox
  * at runtime :).
- *
- * IMPORTANT:
- * Please dont include this file in the src/Makefile.am, it
- * is automatically include by other files.
  */
 
 /*
diff --git a/tests/testutils.h b/tests/testutils.h
index ff5c98a078..482a6bdc0e 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -30,9 +30,9 @@
 #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */
 #define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */
 
-/* Makefile.am provides these two definitions */
+/* Meson provides these two definitions */
 #if !defined(abs_srcdir) || !defined(abs_builddir)
-# error Fix Makefile.am
+# error Fix build system
 #endif
 
 extern virArch virTestHostArch;
diff --git a/tools/wireshark/README.rst b/tools/wireshark/README.rst
index 8407557748..644818fb85 100644
--- a/tools/wireshark/README.rst
+++ b/tools/wireshark/README.rst
@@ -24,8 +24,7 @@ Then dissector will compiled with libvirt itself.
 Add/Remove protocol from dissector's support
 --------------------------------------------
 
-Modify variable ``WS_DISSECTOR_PROTO_FILES``
-in ``tools/wireshark/src/Makefile.am``.
+Modify variable ``input`` in ``tools/wireshark/src/libvirt/meson.build``.
 
 Changing installation directory
 -------------------------------
-- 
2.26.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux