Remove the GUESTFS_PRIVATE=1 define for some tools and tests which don't really use any private API. --- align/Makefile.am | 1 - df/Makefile.am | 1 - tests/protocol/Makefile.am | 1 - tests/qemu/Makefile.am | 2 -- tests/regressions/Makefile.am | 6 ++---- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/align/Makefile.am b/align/Makefile.am index 04eea16..833739a 100644 --- a/align/Makefile.am +++ b/align/Makefile.am @@ -50,7 +50,6 @@ virt_alignment_scan_SOURCES = \ virt_alignment_scan_CPPFLAGS = \ -DGUESTFS_WARN_DEPRECATED=1 \ - -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/df \ -I$(top_srcdir)/fish \ diff --git a/df/Makefile.am b/df/Makefile.am index 256263d..83879cd 100644 --- a/df/Makefile.am +++ b/df/Makefile.am @@ -54,7 +54,6 @@ virt_df_SOURCES = \ virt_df_CPPFLAGS = \ -DGUESTFS_WARN_DEPRECATED=1 \ - -DGUESTFS_PRIVATE=1 \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/fish \ diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am index 8494fa0..4cdd96f 100644 --- a/tests/protocol/Makefile.am +++ b/tests/protocol/Makefile.am @@ -43,7 +43,6 @@ check_PROGRAMS = test-error-messages test_error_messages_SOURCES = \ test-error-messages.c test_error_messages_CPPFLAGS = \ - -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/src -I$(top_builddir)/src test_error_messages_CFLAGS = \ diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am index 091361f..fe45d88 100644 --- a/tests/qemu/Makefile.am +++ b/tests/qemu/Makefile.am @@ -43,7 +43,6 @@ qemu_boot_SOURCES = \ ../../df/estimate-max-threads.h \ qemu-boot.c qemu_boot_CPPFLAGS = \ - -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/df @@ -61,7 +60,6 @@ qemu_boot_LDADD = \ qemu_speed_test_SOURCES = \ qemu-speed-test.c qemu_speed_test_CPPFLAGS = \ - -DGUESTFS_PRIVATE=1 \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/df diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am index 3aae57b..ec97553 100644 --- a/tests/regressions/Makefile.am +++ b/tests/regressions/Makefile.am @@ -130,8 +130,7 @@ rhbz914931_LDADD = \ rhbz1055452_SOURCES = rhbz1055452.c rhbz1055452_CPPFLAGS = \ - -I$(top_srcdir)/src -I$(top_builddir)/src \ - -DGUESTFS_PRIVATE=1 + -I$(top_srcdir)/src -I$(top_builddir)/src rhbz1055452_CFLAGS = \ -pthread \ $(WARN_CFLAGS) $(WERROR_CFLAGS) @@ -140,8 +139,7 @@ rhbz1055452_LDADD = \ test_big_heap_SOURCES = test-big-heap.c test_big_heap_CPPFLAGS = \ - -I$(top_srcdir)/src -I$(top_builddir)/src \ - -DGUESTFS_PRIVATE=1 + -I$(top_srcdir)/src -I$(top_builddir)/src test_big_heap_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) test_big_heap_LDADD = \ -- 2.5.5
Richard W.M. Jones
2016-Mar-22 18:58 UTC
Re: [Libguestfs] [PATCH] Reduce GUESTFS_PRIVATE usage
On Tue, Mar 22, 2016 at 01:41:56PM +0100, Pino Toscano wrote:> Remove the GUESTFS_PRIVATE=1 define for some tools and tests which don't > really use any private API. > --- > align/Makefile.am | 1 - > df/Makefile.am | 1 - > tests/protocol/Makefile.am | 1 - > tests/qemu/Makefile.am | 2 -- > tests/regressions/Makefile.am | 6 ++---- > 5 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/align/Makefile.am b/align/Makefile.am > index 04eea16..833739a 100644 > --- a/align/Makefile.am > +++ b/align/Makefile.am > @@ -50,7 +50,6 @@ virt_alignment_scan_SOURCES = \ > > virt_alignment_scan_CPPFLAGS = \ > -DGUESTFS_WARN_DEPRECATED=1 \ > - -DGUESTFS_PRIVATE=1 \ > -I$(top_srcdir)/src -I$(top_builddir)/src \ > -I$(top_srcdir)/df \ > -I$(top_srcdir)/fish \ > diff --git a/df/Makefile.am b/df/Makefile.am > index 256263d..83879cd 100644 > --- a/df/Makefile.am > +++ b/df/Makefile.am > @@ -54,7 +54,6 @@ virt_df_SOURCES = \ > > virt_df_CPPFLAGS = \ > -DGUESTFS_WARN_DEPRECATED=1 \ > - -DGUESTFS_PRIVATE=1 \ > -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ > -I$(top_srcdir)/src -I$(top_builddir)/src \ > -I$(top_srcdir)/fish \ > diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am > index 8494fa0..4cdd96f 100644 > --- a/tests/protocol/Makefile.am > +++ b/tests/protocol/Makefile.am > @@ -43,7 +43,6 @@ check_PROGRAMS = test-error-messages > test_error_messages_SOURCES = \ > test-error-messages.c > test_error_messages_CPPFLAGS = \ > - -DGUESTFS_PRIVATE=1 \ > -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ > -I$(top_srcdir)/src -I$(top_builddir)/src > test_error_messages_CFLAGS = \ > diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am > index 091361f..fe45d88 100644 > --- a/tests/qemu/Makefile.am > +++ b/tests/qemu/Makefile.am > @@ -43,7 +43,6 @@ qemu_boot_SOURCES = \ > ../../df/estimate-max-threads.h \ > qemu-boot.c > qemu_boot_CPPFLAGS = \ > - -DGUESTFS_PRIVATE=1 \ > -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ > -I$(top_srcdir)/src -I$(top_builddir)/src \ > -I$(top_srcdir)/df > @@ -61,7 +60,6 @@ qemu_boot_LDADD = \ > qemu_speed_test_SOURCES = \ > qemu-speed-test.c > qemu_speed_test_CPPFLAGS = \ > - -DGUESTFS_PRIVATE=1 \ > -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ > -I$(top_srcdir)/src -I$(top_builddir)/src \ > -I$(top_srcdir)/df > diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am > index 3aae57b..ec97553 100644 > --- a/tests/regressions/Makefile.am > +++ b/tests/regressions/Makefile.am > @@ -130,8 +130,7 @@ rhbz914931_LDADD = \ > > rhbz1055452_SOURCES = rhbz1055452.c > rhbz1055452_CPPFLAGS = \ > - -I$(top_srcdir)/src -I$(top_builddir)/src \ > - -DGUESTFS_PRIVATE=1 > + -I$(top_srcdir)/src -I$(top_builddir)/src > rhbz1055452_CFLAGS = \ > -pthread \ > $(WARN_CFLAGS) $(WERROR_CFLAGS) > @@ -140,8 +139,7 @@ rhbz1055452_LDADD = \ > > test_big_heap_SOURCES = test-big-heap.c > test_big_heap_CPPFLAGS = \ > - -I$(top_srcdir)/src -I$(top_builddir)/src \ > - -DGUESTFS_PRIVATE=1 > + -I$(top_srcdir)/src -I$(top_builddir)/src > test_big_heap_CFLAGS = \ > $(WARN_CFLAGS) $(WERROR_CFLAGS) > test_big_heap_LDADD = \ACK Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
Apparently Analagous Threads
- [PATCH v2 2/7] lib: Move utilities to new directory common/utils.
- [PATCH 2/2] lib: Add comment and regression test for case where main process has large heap.
- [PATCH v6 05/41] utils: Split out cleanups into common/cleanups.
- [PATCH 1/2] lib: info: Move common code for setting child rlimits.
- [PATCH 0/5] Rename src/ to lib/ and move common code to common/