Re: [PATCH 1/3] build: Kill include/libvirt/Makefile.am

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

 



On Sun, Jan 10, 2016 at 06:06:21PM -0500, Cole Robinson wrote:
Move all the logic to include/Makefile.am, simplify it with a wildcard,
then kill include/libvirt/Makefile.am
---
configure.ac                |  2 +-
include/Makefile.am         | 19 +++++++++++++++++--
include/libvirt/Makefile.am | 44 --------------------------------------------
3 files changed, 18 insertions(+), 47 deletions(-)
delete mode 100644 include/libvirt/Makefile.am

diff --git a/configure.ac b/configure.ac
index a46f9b3..787d0c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2808,7 +2808,7 @@ AC_CONFIG_FILES([\
        src/libvirt-lxc.pc \
        libvirt.spec mingw-libvirt.spec \
        po/Makefile.in \
-        include/libvirt/Makefile include/libvirt/libvirt-common.h \
+        include/libvirt/libvirt-common.h \
        daemon/Makefile \
        examples/Makefile \
        tests/Makefile \
diff --git a/include/Makefile.am b/include/Makefile.am
index 80361a7..1805700 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in

-## Copyright (C) 2005-2011, 2013 Red Hat, Inc.
+## Copyright (C) 2005-2011, 2013-2016 Red Hat, Inc.
##
## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public
@@ -16,4 +16,19 @@
## License along with this library.  If not, see
## <http://www.gnu.org/licenses/>.

-SUBDIRS=libvirt
+virincdir = $(includedir)/libvirt
+
+allheaders = $(wildcard libvirt/*.h)
+virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders))
+
+EXTRA_DIST = libvirt/libvirt-common.h.in
+
+# Temporarily disabled, but we need it for building
+EXTRA_DIST += libvirt/libvirt-admin.h
+
+all:
+	echo $(EXTRA_DIST)
+	echo $(virinc_HEADERS)
+

Leftover from debugging?

Oterwise looks fine.

Attachment: signature.asc
Description: PGP signature

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list

[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]