| Message ID | 69e590fd8c02c46287bbf4a863b47cd52c0e418a.1452466410.git.crobinso@redhat.com |
|---|---|
| State | Accepted |
| Commit | 48b6ca8302d90680ed007921e46ca1c4c62e3d2d |
| Headers | show |
On 01/11/2016 02:47 AM, Martin Kletzander wrote: > 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? > Yes, thanks for catching. I'll push the first 2 patches with that dropped - Cole -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
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) + +install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am deleted file mode 100644 index 5a4ada0..0000000 --- a/include/libvirt/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2011, 2013-2015 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -virincdir = $(includedir)/libvirt - -virinc_HEADERS = libvirt.h \ - libvirt-common.h \ - libvirt-domain.h \ - libvirt-domain-snapshot.h \ - libvirt-event.h \ - libvirt-host.h \ - libvirt-interface.h \ - libvirt-network.h \ - libvirt-nodedev.h \ - libvirt-nwfilter.h \ - libvirt-secret.h \ - libvirt-storage.h \ - libvirt-stream.h \ - libvirt-lxc.h \ - libvirt-qemu.h \ - virterror.h - -install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(virincdir) - -EXTRA_DIST = libvirt-common.h.in - -# Temporarily disabled, but we need it for building -EXTRA_DIST += libvirt-admin.h