From 75abec1f706e555cd6c9915be03c732b56a94596 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 21 Sep 2020 14:11:14 +0100 Subject: [PATCH] include: Move lib/guestfs.h to include/guestfs.h This brings libguestfs into line with other projects which have a separate include/ directory for the public header. It's also the case that has never particularly belonged in the lib/ subdirectory. Some tools add -Ilib/ but they only need and not any other headers from that directory, and separating out the public header allows us to clean those up. This is certainly the case for examples, and some language bindings and some tests. In future I'm hopeful we can use this as the basis to tease out other dependencies, as a prelude to separating them out from the repo. --- .gitignore | 2 +- Makefile.am | 2 +- align/Makefile.am | 1 + builder/Makefile.am | 6 ++- cat/Makefile.am | 5 +++ common | 2 +- configure.ac | 1 + customize/Makefile.am | 1 + df/Makefile.am | 1 + diff/Makefile.am | 1 + docs/C_SOURCE_FILES | 2 +- edit/Makefile.am | 1 + erlang/Makefile.am | 1 + examples/Makefile.am | 18 ++++---- fish/Makefile.am | 2 + format/Makefile.am | 1 + fuse/Makefile.am | 5 +++ generator/main.ml | 2 +- gobject/Makefile.am | 4 +- include/Makefile.am | 24 +++++++++++ inspector/Makefile.am | 1 + java/Makefile.am | 3 +- lib/Makefile.am | 10 ++--- lua/Makefile.am | 3 +- make-fs/Makefile.am | 1 + ocaml/Makefile.am | 1 + perl/Build.PL.in | 1 + php/Makefile.am | 2 +- python/Makefile.am | 3 +- rescue/Makefile.am | 1 + ruby/Rakefile.in | 2 +- test-tool/Makefile.am | 1 + tests/c-api/Makefile.am | 68 ++++++++++--------------------- tests/c-api/test-add-drive-opts.c | 1 - tests/c-api/test-config.c | 1 - tests/c-api/test-create-handle.c | 1 - tests/c-api/test-debug-to-file.c | 1 - tests/c-api/test-environment.c | 1 - tests/c-api/test-last-errno.c | 1 - tests/c-api/test-private-data.c | 1 - tests/charsets/Makefile.am | 3 +- tests/disks/Makefile.am | 1 + tests/events/Makefile.am | 3 +- tests/mount-local/Makefile.am | 1 + tests/mountable/Makefile.am | 3 +- tests/parallel/Makefile.am | 3 +- tests/protocol/Makefile.am | 3 +- tests/regressions/Makefile.am | 13 ++++-- 48 files changed, 126 insertions(+), 90 deletions(-) create mode 100644 include/Makefile.am diff --git a/.gitignore b/.gitignore index ab4cd0667..510b75051 100644 --- a/.gitignore +++ b/.gitignore @@ -308,6 +308,7 @@ Makefile.in /haskell/Guestfs030Config /haskell/Guestfs050LVCreate /haskell/Guestfs.hs +/include/guestfs.h /inspector/actual-*.xml /inspector/stamp-virt-inspector.pod /inspector/virt-inspector @@ -329,7 +330,6 @@ Makefile.in /lib/guestfs.3 /lib/guestfs-actions.pod /lib/guestfs-availability.pod -/lib/guestfs.h /lib/guestfs-internal-actions.h /lib/guestfs-structs.pod /lib/libguestfs.3 diff --git a/Makefile.am b/Makefile.am index 0a8f139a3..3df1b6a7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ endif SUBDIRS += common/errnostring common/protocol common/qemuopts SUBDIRS += common/utils SUBDIRS += common/structs -SUBDIRS += lib docs examples +SUBDIRS += include lib docs examples # The daemon and the appliance. SUBDIRS += common/mlutils diff --git a/align/Makefile.am b/align/Makefile.am index 6ff4aa3bf..a3a5d67bc 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -33,6 +33,7 @@ virt_alignment_scan_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/parallel -I$(top_builddir)/common/parallel \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ diff --git a/builder/Makefile.am b/builder/Makefile.am index a41eb751b..5add6f84e 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -143,7 +143,8 @@ virt_builder_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/utils \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/include virt_builder_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ @@ -449,7 +450,8 @@ virt_index_validate_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/include virt_index_validate_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -Wno-unused-macros diff --git a/cat/Makefile.am b/cat/Makefile.am index bdc4f11a7..f6253fbff 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -41,6 +41,7 @@ virt_cat_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -69,6 +70,7 @@ virt_filesystems_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -97,6 +99,7 @@ virt_log_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -124,6 +127,7 @@ virt_ls_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/visit \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ @@ -153,6 +157,7 @@ virt_tail_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib diff --git a/common b/common index c840f2e39..858060bfa 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c840f2e39d0bb637a98b224c89f6df011e1d4414 +Subproject commit 858060bfa41095ca5aacd5ee540a382770645a03 diff --git a/configure.ac b/configure.ac index e0cd41cc9..167e76822 100644 --- a/configure.ac +++ b/configure.ac @@ -271,6 +271,7 @@ AC_CONFIG_FILES([Makefile golang/Makefile golang/examples/Makefile haskell/Makefile + include/Makefile inspector/Makefile java/Makefile java/examples/Makefile diff --git a/customize/Makefile.am b/customize/Makefile.am index 6e5d540e2..c926687b3 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -99,6 +99,7 @@ libcustomize_a_CPPFLAGS = \ -I$(shell $(OCAMLC) -where) \ -I$(top_srcdir)/common/utils \ -I$(top_srcdir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/edit libcustomize_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ diff --git a/df/Makefile.am b/df/Makefile.am index 78dccda90..4fc3e2e8d 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -38,6 +38,7 @@ virt_df_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/parallel -I$(top_builddir)/common/parallel \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib diff --git a/diff/Makefile.am b/diff/Makefile.am index 2c82303dd..60434fb42 100644 --- a/diff/Makefile.am +++ b/diff/Makefile.am @@ -32,6 +32,7 @@ virt_diff_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/visit -I$(top_builddir)/common/visit \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/cat -I$(top_srcdir)/fish \ diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES index 26446d4de..cd5bd2924 100644 --- a/docs/C_SOURCE_FILES +++ b/docs/C_SOURCE_FILES @@ -263,6 +263,7 @@ fuse/guestunmount.c fuse/test-fuse.c fuse/test-guestmount-fd.c fuse/test-guestunmount-fd.c +include/guestfs.h inspector/inspector.c java/actions-0.c java/actions-1.c @@ -303,7 +304,6 @@ lib/fuse.c lib/guestfs-internal-actions.h lib/guestfs-internal-all.h lib/guestfs-internal.h -lib/guestfs.h lib/guid.c lib/handle.c lib/info.c diff --git a/edit/Makefile.am b/edit/Makefile.am index 903600625..3da5d2796 100644 --- a/edit/Makefile.am +++ b/edit/Makefile.am @@ -32,6 +32,7 @@ virt_edit_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/edit -I$(top_builddir)/common/edit \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ diff --git a/erlang/Makefile.am b/erlang/Makefile.am index 3da3f9145..27d9ac91b 100644 --- a/erlang/Makefile.am +++ b/erlang/Makefile.am @@ -82,6 +82,7 @@ erl_guestfs_CPPFLAGS = \ -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ -I$(ERLANG_LIB_DIR_erl_interface)/include \ -DEI_NO_DEPR_WARN diff --git a/examples/Makefile.am b/examples/Makefile.am index 6db9d1317..321284041 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -44,7 +44,7 @@ if HAVE_LIBVIRT copy_over_SOURCES = copy-over.c copy_over_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include copy_over_CFLAGS = \ $(LIBVIRT_CFLAGS) \ -pthread \ @@ -56,7 +56,7 @@ copy_over_LDADD = \ libvirt_auth_SOURCES = libvirt-auth.c libvirt_auth_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include libvirt_auth_CFLAGS = \ $(LIBVIRT_CFLAGS) \ -pthread \ @@ -69,7 +69,7 @@ endif create_disk_SOURCES = create-disk.c create_disk_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include create_disk_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) create_disk_LDADD = \ @@ -78,7 +78,7 @@ create_disk_LDADD = \ debug_logging_SOURCES = debug-logging.c debug_logging_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include debug_logging_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) debug_logging_LDADD = \ @@ -87,7 +87,7 @@ debug_logging_LDADD = \ display_icon_SOURCES = display-icon.c display_icon_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include display_icon_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) display_icon_LDADD = \ @@ -96,7 +96,7 @@ display_icon_LDADD = \ inspect_vm_SOURCES = inspect-vm.c inspect_vm_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include inspect_vm_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) inspect_vm_LDADD = \ @@ -106,9 +106,9 @@ if HAVE_FUSE mount_local_SOURCES = mount-local.c mount_local_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include mount_local_CFLAGS = \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ $(FUSE_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) mount_local_LDADD = \ @@ -120,7 +120,7 @@ if HAVE_HIVEX virt_dhcp_address_SOURCES = virt-dhcp-address.c virt_dhcp_address_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/include virt_dhcp_address_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) virt_dhcp_address_LDADD = \ diff --git a/fish/Makefile.am b/fish/Makefile.am index b71455439..d418c9a80 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -110,6 +110,7 @@ libcmds_la_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib libcmds_la_CFLAGS = libcmds_la_LIBADD = \ @@ -128,6 +129,7 @@ guestfish_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/edit -I$(top_builddir)/common/edit \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/progress -I$(top_builddir)/common/progress \ diff --git a/format/Makefile.am b/format/Makefile.am index 01a04dde4..783f02955 100644 --- a/format/Makefile.am +++ b/format/Makefile.am @@ -32,6 +32,7 @@ virt_format_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib diff --git a/fuse/Makefile.am b/fuse/Makefile.am index 35f5b444e..940eefffb 100644 --- a/fuse/Makefile.am +++ b/fuse/Makefile.am @@ -40,6 +40,7 @@ guestmount_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -70,6 +71,7 @@ guestunmount_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -144,6 +146,7 @@ test_fuse_SOURCES = \ test_fuse_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib test_fuse_CFLAGS = \ @@ -163,6 +166,7 @@ test_guestmount_fd_SOURCES = \ test_guestmount_fd_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib test_guestmount_fd_CFLAGS = \ @@ -182,6 +186,7 @@ test_guestunmount_fd_SOURCES = \ test_guestunmount_fd_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib test_guestunmount_fd_CFLAGS = \ diff --git a/generator/main.ml b/generator/main.ml index 86bad7ecc..c2e849e11 100644 --- a/generator/main.ml +++ b/generator/main.ml @@ -94,7 +94,7 @@ Run it from the top source directory using the command C.generate_client_structs_print_h; output_to "lib/uefi.c" UEFI.generate_uefi_c; - output_to "lib/guestfs.h" + output_to "include/guestfs.h" C.generate_guestfs_h; output_to "lib/guestfs-internal-actions.h" C.generate_internal_actions_h; diff --git a/gobject/Makefile.am b/gobject/Makefile.am index c32cc8ec6..e4de15000 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -50,7 +50,9 @@ libguestfs_gobject_1_0_ladir = $(includedir)/guestfs-gobject libguestfs_gobject_1_0_la_HEADERS = $(guestfs_gobject_headers) libguestfs_gobject_1_0_la_SOURCES = $(guestfs_gobject_sources) -libguestfs_gobject_1_0_la_CFLAGS = -I$(top_srcdir)/lib -I$(srcdir)/include \ +libguestfs_gobject_1_0_la_CFLAGS = -I$(top_srcdir)/lib \ + -I$(top_srcdir)/include \ + -I$(srcdir)/include \ -DGUESTFS_PRIVATE=1 \ $(GOBJECT_CFLAGS) libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/lib diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 000000000..08f002b70 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,24 @@ +# libguestfs +# Copyright (C) 2010-2012 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +include $(top_srcdir)/subdir-rules.mk + +generator_built = guestfs.h + +EXTRA_DIST = guestfs.h + +include_HEADERS = guestfs.h diff --git a/inspector/Makefile.am b/inspector/Makefile.am index 162aae253..45aeea214 100644 --- a/inspector/Makefile.am +++ b/inspector/Makefile.am @@ -54,6 +54,7 @@ virt_inspector_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib diff --git a/java/Makefile.am b/java/Makefile.am index e4a70e5e7..59bfa5644 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -113,7 +113,8 @@ libguestfs_jni_la_CPPFLAGS = \ -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include libguestfs_jni_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 4fef46826..f9cc53df1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,7 +20,6 @@ include $(top_srcdir)/subdir-rules.mk noinst_PROGRAMS = generator_built = \ - guestfs.h \ guestfs-internal-actions.h \ actions-0.c \ actions-1.c \ @@ -50,8 +49,6 @@ EXTRA_DIST = \ local/libguestfs.pc.in \ guestfs.pod -include_HEADERS = guestfs.h - lib_LTLIBRARIES = libguestfs.la libguestfs_la_SOURCES = \ @@ -60,7 +57,7 @@ libguestfs_la_SOURCES = \ ../common/qemuopts/qemuopts.h \ ../common/utils/guestfs-utils.h \ ../common/structs/structs-cleanups.h \ - guestfs.h \ + ../include/guestfs.h \ guestfs-internal.h \ guestfs-internal-all.h \ actions-0.c \ @@ -133,7 +130,8 @@ libguestfs_la_CPPFLAGS = \ -I$(top_srcdir)/common/qemuopts -I$(top_builddir)/common/qemuopts \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ - -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib + -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ + -I$(top_srcdir)/include libguestfs_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ @@ -206,7 +204,7 @@ unit_tests_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ - -I$(top_srcdir)/lib -I. + -I$(top_srcdir)/lib -I$(top_srcdir)/include -I. unit_tests_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(RPC_CFLAGS) diff --git a/lua/Makefile.am b/lua/Makefile.am index a26c0baee..4bffee27d 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -43,7 +43,8 @@ libluaguestfs_la_CPPFLAGS = \ -DGUESTFS_PRIVATE=1 \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include libluaguestfs_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ diff --git a/make-fs/Makefile.am b/make-fs/Makefile.am index 263c22211..614586f1f 100644 --- a/make-fs/Makefile.am +++ b/make-fs/Makefile.am @@ -33,6 +33,7 @@ virt_make_fs_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 31d026493..63713ee68 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -83,6 +83,7 @@ libguestfsocaml_a_CPPFLAGS = \ -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib libguestfsocaml_a_CFLAGS = \ diff --git a/perl/Build.PL.in b/perl/Build.PL.in index 691f460f4..a52f30929 100755 --- a/perl/Build.PL.in +++ b/perl/Build.PL.in @@ -62,6 +62,7 @@ my $build = Module::Build->new ( include_dirs => [ '@top_builddir@/lib', '@top_srcdir@/lib', + '@top_srcdir@/include', ], extra_linker_flags => [ '-L@top_builddir@/lib/.libs', diff --git a/php/Makefile.am b/php/Makefile.am index a974cdf21..c635abf41 100644 --- a/php/Makefile.am +++ b/php/Makefile.am @@ -38,7 +38,7 @@ php_DATA = guestfs_php.ini # and we need to add the library to EXTRA_LDFLAGS. all: check-builddir-equals-srcdir extension/config.h $(MAKE) -C extension \ - EXTRA_INCLUDES="-I$(abs_srcdir)/../common/utils -I$(abs_srcdir)/../lib" \ + EXTRA_INCLUDES="-I$(abs_srcdir)/../common/utils -I$(abs_srcdir)/../lib -I$(abs_srcdir)/../include" \ EXTRA_LDFLAGS="-L$(abs_srcdir)/../lib/.libs -lguestfs" \ EXTRA_CFLAGS="-DGUESTFS_PRIVATE=1" \ all diff --git a/python/Makefile.am b/python/Makefile.am index 08f29c8ae..036a60ef1 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -71,7 +71,8 @@ libguestfsmod_la_CPPFLAGS = \ -DGUESTFS_PRIVATE=1 \ $(PYTHON_CFLAGS) \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include libguestfsmod_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) diff --git a/rescue/Makefile.am b/rescue/Makefile.am index 01d1c6ca1..297978f7e 100644 --- a/rescue/Makefile.am +++ b/rescue/Makefile.am @@ -37,6 +37,7 @@ virt_rescue_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/common/windows -I$(top_builddir)/common/windows \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in index 18ec311c5..bdab086e0 100644 --- a/ruby/Rakefile.in +++ b/ruby/Rakefile.in @@ -65,7 +65,7 @@ CLOBBER.include [ "@builddir@/config.save", "@builddir@/ext/**/mkmf.log", # Build locally file MAKEFILE => EXT_CONF do |t| - unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; @RUBY@ #{EXT_CONF} --with-_guestfs-include=$top_srcdir/common/utils:$top_srcdir/lib:$top_builddir --with-_guestfs-lib=$top_builddir/lib/.libs" + unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; @RUBY@ #{EXT_CONF} --with-_guestfs-include=$top_srcdir/common/utils:$top_srcdir/lib:$top_srcdir/include:$top_builddir --with-_guestfs-lib=$top_builddir/lib/.libs" $stderr.puts "Failed to run extconf" break end diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am index 95d3c7bfb..8b7107f87 100644 --- a/test-tool/Makefile.am +++ b/test-tool/Makefile.am @@ -31,6 +31,7 @@ libguestfs_test_tool_SOURCES = \ libguestfs_test_tool_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/options -I$(top_builddir)/common/options \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -DGUESTFS_NO_DEPRECATED=1 \ diff --git a/tests/c-api/Makefile.am b/tests/c-api/Makefile.am index ce28cdd14..365cb4aa4 100644 --- a/tests/c-api/Makefile.am +++ b/tests/c-api/Makefile.am @@ -96,7 +96,8 @@ tests_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/structs -I$(top_builddir)/common/structs \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include tests_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(PCRE_CFLAGS) @@ -122,8 +123,7 @@ test_pwd_LDFLAGS = -all-static # Hand-written C API tests. test_just_header_SOURCES = test-just-header.c -test_just_header_CPPFLAGS = \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_just_header_CPPFLAGS = -I$(top_srcdir)/include test_just_header_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_just_header_LDADD = \ @@ -131,8 +131,7 @@ test_just_header_LDADD = \ if HAVE_CXX test_just_header_cxx_SOURCES = test-just-header-cxx.cpp -test_just_header_cxx_CPPFLAGS = \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_just_header_cxx_CPPFLAGS = -I$(top_srcdir)/include test_just_header_cxx_CXXFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_just_header_cxx_LDADD = \ @@ -140,19 +139,15 @@ test_just_header_cxx_LDADD = \ endif test_create_handle_SOURCES = test-create-handle.c -test_create_handle_CPPFLAGS = \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_create_handle_CPPFLAGS = -I$(top_srcdir)/include test_create_handle_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_create_handle_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/lib/libguestfs.la if HAVE_LIBDL test_dlopen_SOURCES = test-dlopen.c -test_dlopen_CPPFLAGS = \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_dlopen_CPPFLAGS = -I$(top_srcdir)/include test_dlopen_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -DLIBRARY=\"$(top_builddir)/lib/.libs/libguestfs.so.0\" @@ -161,41 +156,31 @@ test_dlopen_LDADD = \ endif test_config_SOURCES = test-config.c -test_config_CPPFLAGS = \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_config_CPPFLAGS = -I$(top_srcdir)/include test_config_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_config_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/lib/libguestfs.la test_add_drive_opts_SOURCES = test-add-drive-opts.c -test_add_drive_opts_CPPFLAGS = \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_add_drive_opts_CPPFLAGS = -I$(top_srcdir)/include test_add_drive_opts_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_add_drive_opts_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/lib/libguestfs.la test_last_errno_SOURCES = test-last-errno.c -test_last_errno_CPPFLAGS = \ - -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_last_errno_CPPFLAGS = -I$(top_srcdir)/include test_last_errno_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_last_errno_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ - $(top_builddir)/lib/libguestfs.la \ - $(top_builddir)/gnulib/lib/libgnu.la + $(top_builddir)/lib/libguestfs.la test_backend_settings_SOURCES = test-backend-settings.c test_backend_settings_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_backend_settings_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_backend_settings_LDADD = \ @@ -204,20 +189,18 @@ test_backend_settings_LDADD = \ $(top_builddir)/lib/libguestfs.la test_private_data_SOURCES = test-private-data.c -test_private_data_CPPFLAGS = \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib +test_private_data_CPPFLAGS = -I$(top_srcdir)/include test_private_data_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_private_data_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/lib/libguestfs.la test_user_cancel_SOURCES = test-user-cancel.c test_user_cancel_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_user_cancel_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) @@ -228,35 +211,26 @@ test_user_cancel_LDADD = \ test_debug_to_file_SOURCES = test-debug-to-file.c test_debug_to_file_CPPFLAGS = \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib \ - -I$(top_srcdir)/gnulib/lib \ - -I$(top_builddir)/gnulib/lib + -I$(top_srcdir)/include \ + -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib test_debug_to_file_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_debug_to_file_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/lib/libguestfs.la \ $(top_builddir)/gnulib/lib/libgnu.la test_environment_SOURCES = test-environment.c -test_environment_CPPFLAGS = \ - -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib \ - -I$(top_srcdir)/gnulib/lib \ - -I$(top_builddir)/gnulib/lib +test_environment_CPPFLAGS = -I$(top_srcdir)/include test_environment_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_environment_LDADD = \ - $(top_builddir)/common/utils/libutils.la \ - $(top_builddir)/lib/libguestfs.la \ - $(LTLIBINTL) \ - $(top_builddir)/gnulib/lib/libgnu.la + $(top_builddir)/lib/libguestfs.la test_event_string_SOURCES = test-event-string.c test_event_string_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/gnulib/lib test_event_string_CFLAGS = \ @@ -271,6 +245,7 @@ test_threads_SOURCES = test-threads.c test_threads_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/gnulib/lib test_threads_CFLAGS = \ @@ -287,6 +262,7 @@ test_add_libvirt_dom_SOURCES = test-add-libvirt-dom.c test_add_libvirt_dom_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/gnulib/lib test_add_libvirt_dom_CFLAGS = \ diff --git a/tests/c-api/test-add-drive-opts.c b/tests/c-api/test-add-drive-opts.c index 462bc54e3..de930e6fb 100644 --- a/tests/c-api/test-add-drive-opts.c +++ b/tests/c-api/test-add-drive-opts.c @@ -26,7 +26,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" int main (int argc, char *argv[]) diff --git a/tests/c-api/test-config.c b/tests/c-api/test-config.c index bffae5254..bf5f5e07d 100644 --- a/tests/c-api/test-config.c +++ b/tests/c-api/test-config.c @@ -26,7 +26,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" int main (int argc, char *argv[]) diff --git a/tests/c-api/test-create-handle.c b/tests/c-api/test-create-handle.c index 442ec6b73..53b05a302 100644 --- a/tests/c-api/test-create-handle.c +++ b/tests/c-api/test-create-handle.c @@ -26,7 +26,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" int main (int argc, char *argv[]) diff --git a/tests/c-api/test-debug-to-file.c b/tests/c-api/test-debug-to-file.c index 5e6b8ac29..2390cd9c9 100644 --- a/tests/c-api/test-debug-to-file.c +++ b/tests/c-api/test-debug-to-file.c @@ -30,7 +30,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" #include "ignore-value.h" diff --git a/tests/c-api/test-environment.c b/tests/c-api/test-environment.c index fade0720b..3c3ed8a40 100644 --- a/tests/c-api/test-environment.c +++ b/tests/c-api/test-environment.c @@ -31,7 +31,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" int main (int argc, char *argv[]) diff --git a/tests/c-api/test-last-errno.c b/tests/c-api/test-last-errno.c index 056acd526..8b3282584 100644 --- a/tests/c-api/test-last-errno.c +++ b/tests/c-api/test-last-errno.c @@ -31,7 +31,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" int main (int argc, char *argv[]) diff --git a/tests/c-api/test-private-data.c b/tests/c-api/test-private-data.c index 5107ec8a5..0d6e1fdac 100644 --- a/tests/c-api/test-private-data.c +++ b/tests/c-api/test-private-data.c @@ -29,7 +29,6 @@ #include #include "guestfs.h" -#include "guestfs-utils.h" #define PREFIX "test_" diff --git a/tests/charsets/Makefile.am b/tests/charsets/Makefile.am index f9868d512..6e74891bc 100644 --- a/tests/charsets/Makefile.am +++ b/tests/charsets/Makefile.am @@ -28,7 +28,8 @@ test_charset_fidelity_SOURCES = test-charset-fidelity.c test_charset_fidelity_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_charset_fidelity_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_charset_fidelity_LDADD = \ diff --git a/tests/disks/Makefile.am b/tests/disks/Makefile.am index bdbcccf5e..8a1eace6d 100644 --- a/tests/disks/Makefile.am +++ b/tests/disks/Makefile.am @@ -53,6 +53,7 @@ test_add_disks_SOURCES = \ test_add_disks_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib test_add_disks_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) diff --git a/tests/events/Makefile.am b/tests/events/Makefile.am index 01750b623..fdcf8305d 100644 --- a/tests/events/Makefile.am +++ b/tests/events/Makefile.am @@ -35,7 +35,8 @@ test_libvirt_auth_callbacks_SOURCES = test-libvirt-auth-callbacks.c test_libvirt_auth_callbacks_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_libvirt_auth_callbacks_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBVIRT_CFLAGS) diff --git a/tests/mount-local/Makefile.am b/tests/mount-local/Makefile.am index d678147f8..46927c99d 100644 --- a/tests/mount-local/Makefile.am +++ b/tests/mount-local/Makefile.am @@ -33,6 +33,7 @@ test_parallel_mount_local_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/common/parallel -I$(top_builddir)/common/parallel \ -I$(top_srcdir)/df test_parallel_mount_local_CFLAGS = \ diff --git a/tests/mountable/Makefile.am b/tests/mountable/Makefile.am index efed5c53f..30d4cff30 100644 --- a/tests/mountable/Makefile.am +++ b/tests/mountable/Makefile.am @@ -30,7 +30,8 @@ test_internal_parse_mountable_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_internal_parse_mountable_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_internal_parse_mountable_LDADD = \ diff --git a/tests/parallel/Makefile.am b/tests/parallel/Makefile.am index 5e7b56336..110f460c2 100644 --- a/tests/parallel/Makefile.am +++ b/tests/parallel/Makefile.am @@ -29,7 +29,8 @@ test_parallel_CPPFLAGS = \ -DGUESTFS_NO_DEPRECATED=1 \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_parallel_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am index e533ac073..ef7f1d9e2 100644 --- a/tests/protocol/Makefile.am +++ b/tests/protocol/Makefile.am @@ -47,7 +47,8 @@ test_error_messages_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/protocol -I$(top_builddir)/common/protocol \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_error_messages_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(RPC_CFLAGS) diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am index 9a1d2c81d..ecb0d68a7 100644 --- a/tests/regressions/Makefile.am +++ b/tests/regressions/Makefile.am @@ -105,7 +105,8 @@ rhbz501893_SOURCES = rhbz501893.c rhbz501893_CPPFLAGS = \ -DGUESTFS_NO_WARN_DEPRECATED=1 \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include rhbz501893_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) rhbz501893_LDADD = \ @@ -116,7 +117,8 @@ rhbz790721_SOURCES = rhbz790721.c rhbz790721_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include rhbz790721_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) @@ -130,6 +132,7 @@ rhbz914931_CPPFLAGS = \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include \ -DGUESTFS_PRIVATE=1 rhbz914931_CFLAGS = \ -pthread \ @@ -144,7 +147,8 @@ rhbz1055452_SOURCES = rhbz1055452.c rhbz1055452_CPPFLAGS = \ -DGUESTFS_NO_WARN_DEPRECATED=1 \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include rhbz1055452_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) @@ -155,7 +159,8 @@ rhbz1055452_LDADD = \ test_big_heap_SOURCES = test-big-heap.c test_big_heap_CPPFLAGS = \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/include test_big_heap_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_big_heap_LDADD = \