mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
Rename src/ to lib/
This commit is contained in:
Richard W.M. Jones
40
.gitignore
vendored
40
.gitignore
vendored
@@ -305,6 +305,26 @@ Makefile.in
|
||||
/java/doc-stamp
|
||||
/java/examples/guestfs-java.3
|
||||
/java/examples/stamp-guestfs-java.pod
|
||||
/lib/actions-?.c
|
||||
/lib/actions-variants.c
|
||||
/lib/bindtests.c
|
||||
/lib/event-string.c
|
||||
/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
|
||||
/lib/libguestfs.pc
|
||||
/lib/libguestfs.syms
|
||||
/lib/.libs/libguestfs.so
|
||||
/lib/libvirt-is-version
|
||||
/lib/stamp-guestfs.pod
|
||||
/lib/structs-compare.c
|
||||
/lib/structs-copy.c
|
||||
/lib/structs-free.c
|
||||
/lib/unit-tests
|
||||
/libguestfs.spec
|
||||
/libguestfs-*.tar.gz
|
||||
/libtool
|
||||
@@ -498,26 +518,6 @@ Makefile.in
|
||||
/sparsify/stamp-virt-sparsify.pod
|
||||
/sparsify/virt-sparsify
|
||||
/sparsify/virt-sparsify.1
|
||||
/src/actions-?.c
|
||||
/src/actions-variants.c
|
||||
/src/bindtests.c
|
||||
/src/event-string.c
|
||||
/src/guestfs.3
|
||||
/src/guestfs-actions.pod
|
||||
/src/guestfs-availability.pod
|
||||
/src/guestfs.h
|
||||
/src/guestfs-internal-actions.h
|
||||
/src/guestfs-structs.pod
|
||||
/src/libguestfs.3
|
||||
/src/libguestfs.pc
|
||||
/src/libguestfs.syms
|
||||
/src/.libs/libguestfs.so
|
||||
/src/libvirt-is-version
|
||||
/src/stamp-guestfs.pod
|
||||
/src/structs-compare.c
|
||||
/src/structs-copy.c
|
||||
/src/structs-free.c
|
||||
/src/unit-tests
|
||||
/stamp-h1
|
||||
/sysprep/.depend
|
||||
/sysprep/stamp-script1.sh
|
||||
|
||||
@@ -39,7 +39,7 @@ endif
|
||||
|
||||
# Basic source for the library.
|
||||
SUBDIRS += common/errnostring common/protocol common/utils
|
||||
SUBDIRS += src docs examples po
|
||||
SUBDIRS += lib docs examples po
|
||||
|
||||
# The daemon and the appliance.
|
||||
if ENABLE_DAEMON
|
||||
|
||||
@@ -40,7 +40,7 @@ virt_alignment_scan_SOURCES = \
|
||||
virt_alignment_scan_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/df \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
|
||||
@@ -54,7 +54,7 @@ virt_alignment_scan_CFLAGS = \
|
||||
|
||||
virt_alignment_scan_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
@@ -101,7 +101,7 @@ virt_builder_CPPFLAGS = \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
-I$(top_srcdir)/common/utils \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/fish
|
||||
virt_builder_CFLAGS = \
|
||||
-pthread \
|
||||
@@ -115,13 +115,13 @@ virt_builder_CFLAGS = \
|
||||
BOBJECTS = $(SOURCES_ML:.ml=.cmo)
|
||||
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
|
||||
|
||||
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
|
||||
# -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
|
||||
# option to be passed to gcc, so we don't try linking against an
|
||||
# installed copy of libguestfs.
|
||||
OCAMLPACKAGES = \
|
||||
-package str,unix \
|
||||
-I $(top_builddir)/common/utils/.libs \
|
||||
-I $(top_builddir)/src/.libs \
|
||||
-I $(top_builddir)/lib/.libs \
|
||||
-I $(top_builddir)/gnulib/lib/.libs \
|
||||
-I $(top_builddir)/ocaml \
|
||||
-I $(top_builddir)/mllib \
|
||||
@@ -337,7 +337,7 @@ 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)/src
|
||||
-I$(top_srcdir)/lib
|
||||
virt_index_validate_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
|
||||
-Wno-unused-macros
|
||||
|
||||
@@ -44,7 +44,7 @@ virt_cat_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -54,7 +54,7 @@ virt_cat_CFLAGS = \
|
||||
|
||||
virt_cat_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
@@ -69,7 +69,7 @@ virt_filesystems_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -79,7 +79,7 @@ virt_filesystems_CFLAGS = \
|
||||
|
||||
virt_filesystems_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
@@ -94,7 +94,7 @@ virt_log_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -104,7 +104,7 @@ virt_log_CFLAGS = \
|
||||
|
||||
virt_log_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
@@ -121,7 +121,7 @@ virt_ls_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -131,7 +131,7 @@ virt_ls_CFLAGS = \
|
||||
|
||||
virt_ls_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
@@ -146,7 +146,7 @@ virt_tail_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -156,7 +156,7 @@ virt_tail_CFLAGS = \
|
||||
|
||||
virt_tail_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
2
cfg.mk
2
cfg.mk
@@ -33,7 +33,7 @@ exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^test-data/|\.patch$|
|
||||
exclude_file_name_regexp--sc_prohibit_magic_number_exit = ^(po|po-docs)/|\.pod$|^fuse/guestunmount\.c
|
||||
exclude_file_name_regexp--sc_prohibit_strcmp = ^(examples|po-docs)/|\.pod$
|
||||
exclude_file_name_regexp--sc_prohibit_strcmp_and_strncmp = ^(examples|po-docs)/|\.pod$
|
||||
exclude_file_name_regexp--sc_prohibit_strncpy = ^src/launch-.*\.c$
|
||||
exclude_file_name_regexp--sc_prohibit_strncpy = ^lib/launch-.*\.c$
|
||||
exclude_file_name_regexp--sc_require_config_h = ^examples/|^tests/c-api/test-just-header\.c$
|
||||
exclude_file_name_regexp--sc_require_config_h_first = ^examples/|^tests/c-api/test-just-header\.c$|^python/guestfs-py-byhand\.c$
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ endif
|
||||
guestfs_protocol.c: guestfs_protocol.x
|
||||
rm -f $@-t $@-t2
|
||||
$(RPCGEN) $(RPCGEN_DEFS) -c -o $@-t $<
|
||||
$(SED) 's,\.\./\(\.\./\)*src,.,' < $@-t > $@-t2
|
||||
$(SED) 's,\.\./\(\.\./\)*lib,.,' < $@-t > $@-t2
|
||||
rm $@-t
|
||||
mv $@-t2 $@
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ EXTRA_DIST = \
|
||||
noinst_LTLIBRARIES = libutils.la
|
||||
|
||||
libutils_la_SOURCES = \
|
||||
../../src/guestfs.h \
|
||||
../../lib/guestfs.h \
|
||||
cleanup.c \
|
||||
guestfs-internal-frontend.h \
|
||||
guestfs-internal-frontend-cleanups.h \
|
||||
@@ -46,7 +46,7 @@ libutils_la_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DGUESTFS_PRIVATE=1 \
|
||||
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
libutils_la_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
|
||||
$(GCC_VISIBILITY_HIDDEN) \
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
*
|
||||
* The daemon does B<not> use this header. If you need a place to put
|
||||
* something shared with absolutely everything including the daemon,
|
||||
* put it in F<src/guestfs-internal-all.h>
|
||||
* put it in F<lib/guestfs-internal-all.h>
|
||||
*
|
||||
* If a definition is only needed by a single component of libguestfs
|
||||
* (eg. just the library, or just a single virt tool) then it should
|
||||
|
||||
@@ -366,7 +366,7 @@ guestfs_int_is_true (const char *str)
|
||||
/**
|
||||
* Check a string for validity, that it contains only certain
|
||||
* characters, and minimum and maximum length. This function is
|
||||
* usually wrapped in a VALID_* macro, see F<src/drives.c> for an
|
||||
* usually wrapped in a VALID_* macro, see F<lib/drives.c> for an
|
||||
* example.
|
||||
*
|
||||
* C<str> is the string to check.
|
||||
|
||||
@@ -211,6 +211,8 @@ AC_CONFIG_FILES([Makefile
|
||||
inspector/Makefile
|
||||
java/Makefile
|
||||
java/examples/Makefile
|
||||
lib/Makefile
|
||||
lib/libguestfs.pc
|
||||
lua/Makefile
|
||||
lua/examples/Makefile
|
||||
make-fs/Makefile
|
||||
@@ -238,8 +240,6 @@ AC_CONFIG_FILES([Makefile
|
||||
ruby/examples/Makefile
|
||||
ruby/ext/guestfs/extconf.rb
|
||||
sparsify/Makefile
|
||||
src/Makefile
|
||||
src/libguestfs.pc
|
||||
sysprep/Makefile
|
||||
test-data/Makefile
|
||||
test-data/binaries/Makefile
|
||||
|
||||
@@ -21,7 +21,7 @@ make-check-on-installed.pl
|
||||
windows-icons.pl
|
||||
This script lets you extract all the icons from a Windows
|
||||
guest. We use this to locate the Windows logo in new releases
|
||||
of Windows (see src/inspect-icon.c).
|
||||
of Windows (see lib/inspect-icon.c).
|
||||
|
||||
visualize-alignment/
|
||||
Tests for visualizing block device reads and writes and
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
# This script lets you extract all the icons from a Windows guest. We
|
||||
# use this to locate the Windows logo in new releases of Windows (see
|
||||
# src/inspect-icon.c).
|
||||
# lib/inspect-icon.c).
|
||||
#
|
||||
# Use it like this:
|
||||
# ./run ./contrib/windows-icons.pl /path/to/windows-disk.img
|
||||
|
||||
@@ -97,7 +97,7 @@ libcustomize_a_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/common/utils \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/fish
|
||||
libcustomize_a_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
|
||||
@@ -114,13 +114,13 @@ else
|
||||
OBJECTS = $(XOBJECTS)
|
||||
endif
|
||||
|
||||
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
|
||||
# -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
|
||||
# option to be passed to gcc, so we don't try linking against an
|
||||
# installed copy of libguestfs.
|
||||
OCAMLPACKAGES = \
|
||||
-package str,unix \
|
||||
-I $(top_builddir)/common/utils/.libs \
|
||||
-I $(top_builddir)/src/.libs \
|
||||
-I $(top_builddir)/lib/.libs \
|
||||
-I $(top_builddir)/gnulib/lib/.libs \
|
||||
-I $(top_builddir)/ocaml \
|
||||
-I $(top_builddir)/mllib \
|
||||
|
||||
@@ -190,8 +190,8 @@ guestfsd_LDADD = \
|
||||
guestfsd_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
-I$(top_builddir)/gnulib/lib \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/common/errnostring \
|
||||
-I$(top_builddir)/common/errnostring \
|
||||
-I$(top_srcdir)/common/protocol \
|
||||
|
||||
@@ -42,7 +42,7 @@ virt_df_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -54,7 +54,7 @@ virt_df_CFLAGS = \
|
||||
|
||||
virt_df_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
@@ -48,7 +48,7 @@ virt_dib_CPPFLAGS = \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
-I$(top_srcdir)/common/utils \
|
||||
-I$(top_srcdir)/src
|
||||
-I$(top_srcdir)/lib
|
||||
virt_dib_CFLAGS = \
|
||||
-pthread \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
@@ -57,13 +57,13 @@ BOBJECTS = \
|
||||
$(SOURCES_ML:.ml=.cmo)
|
||||
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
|
||||
|
||||
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
|
||||
# -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
|
||||
# option to be passed to gcc, so we don't try linking against an
|
||||
# installed copy of libguestfs.
|
||||
OCAMLPACKAGES = \
|
||||
-package str,unix \
|
||||
-I $(top_builddir)/common/utils/.libs \
|
||||
-I $(top_builddir)/src/.libs \
|
||||
-I $(top_builddir)/lib/.libs \
|
||||
-I $(top_builddir)/gnulib/lib/.libs \
|
||||
-I $(top_builddir)/ocaml \
|
||||
-I $(top_builddir)/mllib
|
||||
|
||||
@@ -36,7 +36,7 @@ virt_diff_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/cat -I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -46,7 +46,7 @@ virt_diff_CFLAGS = \
|
||||
|
||||
virt_diff_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
@@ -248,6 +248,77 @@ java/actions-4.c
|
||||
java/actions-5.c
|
||||
java/actions-6.c
|
||||
java/handle.c
|
||||
lib/actions-0.c
|
||||
lib/actions-1.c
|
||||
lib/actions-2.c
|
||||
lib/actions-3.c
|
||||
lib/actions-4.c
|
||||
lib/actions-5.c
|
||||
lib/actions-6.c
|
||||
lib/actions-support.c
|
||||
lib/actions-variants.c
|
||||
lib/alloc.c
|
||||
lib/appliance-cpu.c
|
||||
lib/appliance-kcmdline.c
|
||||
lib/appliance-uefi.c
|
||||
lib/appliance.c
|
||||
lib/available.c
|
||||
lib/bindtests.c
|
||||
lib/canonical-name.c
|
||||
lib/command.c
|
||||
lib/conn-socket.c
|
||||
lib/copy-in-out.c
|
||||
lib/create.c
|
||||
lib/dbdump.c
|
||||
lib/drives.c
|
||||
lib/errors.c
|
||||
lib/event-string.c
|
||||
lib/events.c
|
||||
lib/file.c
|
||||
lib/filearch.c
|
||||
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
|
||||
lib/inspect-apps.c
|
||||
lib/inspect-fs-cd.c
|
||||
lib/inspect-fs-unix.c
|
||||
lib/inspect-fs-windows.c
|
||||
lib/inspect-fs.c
|
||||
lib/inspect-icon.c
|
||||
lib/inspect.c
|
||||
lib/journal.c
|
||||
lib/launch-direct.c
|
||||
lib/launch-libvirt.c
|
||||
lib/launch-uml.c
|
||||
lib/launch-unix.c
|
||||
lib/launch.c
|
||||
lib/libvirt-auth.c
|
||||
lib/libvirt-domain.c
|
||||
lib/libvirt-is-version.c
|
||||
lib/listfs.c
|
||||
lib/lpj.c
|
||||
lib/match.c
|
||||
lib/mountable.c
|
||||
lib/osinfo.c
|
||||
lib/private-data.c
|
||||
lib/proto.c
|
||||
lib/qemu.c
|
||||
lib/stringsbuf.c
|
||||
lib/structs-compare.c
|
||||
lib/structs-copy.c
|
||||
lib/structs-free.c
|
||||
lib/tmpdirs.c
|
||||
lib/tsk.c
|
||||
lib/umask.c
|
||||
lib/unit-tests.c
|
||||
lib/version.c
|
||||
lib/wait.c
|
||||
lib/whole-file.c
|
||||
lua/lua-guestfs.c
|
||||
make-fs/make-fs.c
|
||||
mllib/common_utils-c.c
|
||||
@@ -309,77 +380,6 @@ ruby/ext/guestfs/actions.h
|
||||
ruby/ext/guestfs/handle.c
|
||||
ruby/ext/guestfs/module.c
|
||||
sparsify/dummy.c
|
||||
src/actions-0.c
|
||||
src/actions-1.c
|
||||
src/actions-2.c
|
||||
src/actions-3.c
|
||||
src/actions-4.c
|
||||
src/actions-5.c
|
||||
src/actions-6.c
|
||||
src/actions-support.c
|
||||
src/actions-variants.c
|
||||
src/alloc.c
|
||||
src/appliance-cpu.c
|
||||
src/appliance-kcmdline.c
|
||||
src/appliance-uefi.c
|
||||
src/appliance.c
|
||||
src/available.c
|
||||
src/bindtests.c
|
||||
src/canonical-name.c
|
||||
src/command.c
|
||||
src/conn-socket.c
|
||||
src/copy-in-out.c
|
||||
src/create.c
|
||||
src/dbdump.c
|
||||
src/drives.c
|
||||
src/errors.c
|
||||
src/event-string.c
|
||||
src/events.c
|
||||
src/file.c
|
||||
src/filearch.c
|
||||
src/fuse.c
|
||||
src/guestfs-internal-actions.h
|
||||
src/guestfs-internal-all.h
|
||||
src/guestfs-internal.h
|
||||
src/guestfs.h
|
||||
src/guid.c
|
||||
src/handle.c
|
||||
src/info.c
|
||||
src/inspect-apps.c
|
||||
src/inspect-fs-cd.c
|
||||
src/inspect-fs-unix.c
|
||||
src/inspect-fs-windows.c
|
||||
src/inspect-fs.c
|
||||
src/inspect-icon.c
|
||||
src/inspect.c
|
||||
src/journal.c
|
||||
src/launch-direct.c
|
||||
src/launch-libvirt.c
|
||||
src/launch-uml.c
|
||||
src/launch-unix.c
|
||||
src/launch.c
|
||||
src/libvirt-auth.c
|
||||
src/libvirt-domain.c
|
||||
src/libvirt-is-version.c
|
||||
src/listfs.c
|
||||
src/lpj.c
|
||||
src/match.c
|
||||
src/mountable.c
|
||||
src/osinfo.c
|
||||
src/private-data.c
|
||||
src/proto.c
|
||||
src/qemu.c
|
||||
src/stringsbuf.c
|
||||
src/structs-compare.c
|
||||
src/structs-copy.c
|
||||
src/structs-free.c
|
||||
src/tmpdirs.c
|
||||
src/tsk.c
|
||||
src/umask.c
|
||||
src/unit-tests.c
|
||||
src/version.c
|
||||
src/wait.c
|
||||
src/whole-file.c
|
||||
sysprep/dummy.c
|
||||
test-tool/test-tool.c
|
||||
utils/boot-analysis/boot-analysis-timeline.c
|
||||
|
||||
@@ -21,7 +21,7 @@ Libguestfs uses an autotools-based build system, with the main files
|
||||
being F<configure.ac> and F<Makefile.am>. See L</THE BUILD SYSTEM>.
|
||||
|
||||
The F<generator> subdirectory contains the generator, plus files
|
||||
describing the API. The F<src> subdirectory contains source for the
|
||||
describing the API. The F<lib> subdirectory contains source for the
|
||||
library. The F<appliance> and F<daemon> subdirectories contain the
|
||||
source for the code that builds the appliance, and the code that runs
|
||||
in the appliance respectively. Other directories are covered in the
|
||||
@@ -31,7 +31,7 @@ Apart from the fact that all API entry points go via some generated
|
||||
code, the library is straightforward. (In fact, even the generated
|
||||
code is designed to be readable, and should be read as ordinary code).
|
||||
Some actions run entirely in the library, and are written as C
|
||||
functions in files under F<src>. Others are forwarded to the daemon
|
||||
functions in files under F<lib>. Others are forwarded to the daemon
|
||||
where (after some generated RPC marshalling) they appear as C
|
||||
functions in files under F<daemon>.
|
||||
|
||||
@@ -40,7 +40,7 @@ To build from source, first read the L<guestfs-building(1)>.
|
||||
=head1 SOURCE CODE SUBDIRECTORIES
|
||||
|
||||
There are a lot of subdirectories in the source tree! Which ones
|
||||
should you concentrate on first? F<src> and F<daemon> which contain
|
||||
should you concentrate on first? F<lib> and F<daemon> which contain
|
||||
the source code of the core library. F<generator> is the code
|
||||
generator described above, so that is important. The F<Makefile.am>
|
||||
in the root directory will tell you in which order the subdirectories
|
||||
@@ -169,6 +169,10 @@ under here.
|
||||
|
||||
L<virt-inspector(1)>, the virtual machine image inspector.
|
||||
|
||||
=item F<lib>
|
||||
|
||||
Source code to the C library.
|
||||
|
||||
=item F<logo>
|
||||
|
||||
Logo used on the website. The fish is called Arthur by the way.
|
||||
@@ -213,10 +217,6 @@ L<virt-resize(1)> command and documentation.
|
||||
|
||||
L<virt-sparsify(1)> command and documentation.
|
||||
|
||||
=item F<src>
|
||||
|
||||
Source code to the C library.
|
||||
|
||||
=item F<sysprep>
|
||||
|
||||
L<virt-sysprep(1)> command and documentation.
|
||||
@@ -348,7 +348,7 @@ For daemon actions, implement the function C<do_E<lt>nameE<gt>> in the
|
||||
C<daemon/> directory.
|
||||
|
||||
For library actions, implement the function C<guestfs_impl_E<lt>nameE<gt>>
|
||||
in the C<src/> directory.
|
||||
in the C<lib/> directory.
|
||||
|
||||
In either case, use another function as an example of what to do.
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ foreach $input (@ARGV) {
|
||||
}
|
||||
}
|
||||
|
||||
# Sort the input files into directory sections. Put the 'src'
|
||||
# Sort the input files into directory sections. Put the 'lib'
|
||||
# directory first, and the rest follow in alphabetical order.
|
||||
my %dirs = ();
|
||||
foreach $input (@inputs) {
|
||||
@@ -157,9 +157,9 @@ foreach $input (@inputs) {
|
||||
push @{$dirs{$1}}, $2
|
||||
}
|
||||
sub src_first {
|
||||
if ($a eq "src" && $b eq "src") { return 0 }
|
||||
elsif ($a eq "src") { return -1 }
|
||||
elsif ($b eq "src") { return 1 }
|
||||
if ($a eq "lib" && $b eq "lib") { return 0 }
|
||||
elsif ($a eq "lib") { return -1 }
|
||||
elsif ($b eq "lib") { return 1 }
|
||||
else { return $a cmp $b }
|
||||
}
|
||||
my @dirs = sort src_first (keys %dirs);
|
||||
|
||||
@@ -38,7 +38,7 @@ virt_edit_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -48,7 +48,7 @@ virt_edit_CFLAGS = \
|
||||
|
||||
virt_edit_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
@@ -81,7 +81,7 @@ erl_guestfs_SOURCES = \
|
||||
erl_guestfs_CPPFLAGS = \
|
||||
-DGUESTFS_PRIVATE=1 \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
|
||||
-I$(ERLANG_LIB_DIR_erl_interface)/include
|
||||
|
||||
@@ -93,7 +93,7 @@ erl_guestfs_LDADD = \
|
||||
$(ERLANG_LIB_DIR_erl_interface)/lib/libei.a \
|
||||
-lpthread \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
$(LTLIBINTL) \
|
||||
|
||||
@@ -44,88 +44,88 @@ if HAVE_LIBVIRT
|
||||
copy_over_SOURCES = copy-over.c
|
||||
copy_over_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
copy_over_CFLAGS = \
|
||||
$(LIBVIRT_CFLAGS) \
|
||||
-pthread \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
copy_over_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBVIRT_LIBS)
|
||||
|
||||
libvirt_auth_SOURCES = libvirt-auth.c
|
||||
libvirt_auth_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
libvirt_auth_CFLAGS = \
|
||||
$(LIBVIRT_CFLAGS) \
|
||||
-pthread \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
libvirt_auth_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBVIRT_LIBS)
|
||||
endif
|
||||
|
||||
create_disk_SOURCES = create-disk.c
|
||||
create_disk_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
create_disk_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
create_disk_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la
|
||||
$(top_builddir)/lib/libguestfs.la
|
||||
|
||||
debug_logging_SOURCES = debug-logging.c
|
||||
debug_logging_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
debug_logging_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
debug_logging_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la
|
||||
$(top_builddir)/lib/libguestfs.la
|
||||
|
||||
display_icon_SOURCES = display-icon.c
|
||||
display_icon_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
display_icon_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
display_icon_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la
|
||||
$(top_builddir)/lib/libguestfs.la
|
||||
|
||||
inspect_vm_SOURCES = inspect-vm.c
|
||||
inspect_vm_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
inspect_vm_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
inspect_vm_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la
|
||||
$(top_builddir)/lib/libguestfs.la
|
||||
|
||||
if HAVE_FUSE
|
||||
mount_local_SOURCES = mount-local.c
|
||||
mount_local_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
mount_local_CFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
$(FUSE_CFLAGS) \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
mount_local_LDADD = \
|
||||
$(FUSE_LIBS) \
|
||||
$(top_builddir)/src/libguestfs.la
|
||||
$(top_builddir)/lib/libguestfs.la
|
||||
endif
|
||||
|
||||
if HAVE_HIVEX
|
||||
virt_dhcp_address_SOURCES = virt-dhcp-address.c
|
||||
virt_dhcp_address_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
virt_dhcp_address_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
virt_dhcp_address_LDADD = \
|
||||
$(top_builddir)/src/libguestfs.la
|
||||
$(top_builddir)/lib/libguestfs.la
|
||||
endif
|
||||
|
||||
man_MANS = guestfs-examples.3
|
||||
|
||||
@@ -98,7 +98,7 @@ libfishcommon_la_SOURCES = \
|
||||
libfishcommon_la_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish -I$(top_builddir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
libfishcommon_la_CFLAGS = \
|
||||
@@ -106,7 +106,7 @@ libfishcommon_la_CFLAGS = \
|
||||
$(LIBXML2_CFLAGS)
|
||||
libfishcommon_la_LIBADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LTLIBINTL)
|
||||
|
||||
@@ -164,7 +164,7 @@ guestfish_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish -I$(top_builddir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -178,7 +178,7 @@ guestfish_LDADD = \
|
||||
$(LIBREADLINE) \
|
||||
$(LIBTINFO_LIBS) \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LTLIBINTL) \
|
||||
-lm
|
||||
|
||||
@@ -31,7 +31,7 @@ virt_format_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -42,7 +42,7 @@ virt_format_CFLAGS = \
|
||||
|
||||
virt_format_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
@@ -45,7 +45,7 @@ guestmount_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -59,7 +59,7 @@ guestmount_LDADD = \
|
||||
$(FUSE_LIBS) \
|
||||
$(LIBCONFIG_LIBS) \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
@@ -76,7 +76,7 @@ guestunmount_SOURCES = \
|
||||
guestunmount_CPPFLAGS = \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -85,7 +85,7 @@ guestunmount_CFLAGS = \
|
||||
|
||||
guestunmount_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
$(LTLIBINTL) \
|
||||
@@ -147,7 +147,7 @@ test_fuse_SOURCES = \
|
||||
|
||||
test_fuse_CPPFLAGS = \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
test_fuse_CFLAGS = \
|
||||
@@ -155,7 +155,7 @@ test_fuse_CFLAGS = \
|
||||
|
||||
test_fuse_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
$(ACL_LIBS) \
|
||||
@@ -166,7 +166,7 @@ test_guestmount_fd_SOURCES = \
|
||||
|
||||
test_guestmount_fd_CPPFLAGS = \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
test_guestmount_fd_CFLAGS = \
|
||||
@@ -174,7 +174,7 @@ test_guestmount_fd_CFLAGS = \
|
||||
|
||||
test_guestmount_fd_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
$(LTLIBINTL) \
|
||||
@@ -185,7 +185,7 @@ test_guestunmount_fd_SOURCES = \
|
||||
|
||||
test_guestunmount_fd_CPPFLAGS = \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
test_guestunmount_fd_CFLAGS = \
|
||||
@@ -193,7 +193,7 @@ test_guestunmount_fd_CFLAGS = \
|
||||
|
||||
test_guestunmount_fd_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
$(LTLIBINTL) \
|
||||
|
||||
@@ -13658,9 +13658,9 @@ let () =
|
||||
| { proc_nr = None } -> ()
|
||||
) non_daemon_functions
|
||||
|
||||
(* This is used to generate the src/MAX_PROC_NR file which
|
||||
(* This is used to generate the lib/MAX_PROC_NR file which
|
||||
* contains the maximum procedure number, a surrogate for the
|
||||
* ABI version number. See src/Makefile.am for the details.
|
||||
* ABI version number. See lib/Makefile.am for the details.
|
||||
*)
|
||||
let max_proc_nr =
|
||||
let proc_nrs = List.map (
|
||||
|
||||
@@ -57,5 +57,5 @@ val fish_commands : Types.action list
|
||||
(** Non-API meta-commands available only in guestfish. *)
|
||||
|
||||
val max_proc_nr : int
|
||||
(** The largest procedure number used (also saved in [src/MAX_PROC_NR] and
|
||||
(** The largest procedure number used (also saved in [lib/MAX_PROC_NR] and
|
||||
used as the minor version number of the shared library). *)
|
||||
|
||||
@@ -106,21 +106,21 @@ Run it from the top source directory using the command
|
||||
output_to "common/utils/structs-print.h" generate_client_structs_print_h;
|
||||
output_to "common/utils/uefi.c" generate_uefi_c;
|
||||
|
||||
output_to "src/guestfs.h" generate_guestfs_h;
|
||||
output_to "src/guestfs-internal-actions.h" generate_internal_actions_h;
|
||||
output_to "src/bindtests.c" generate_bindtests;
|
||||
output_to "src/guestfs-structs.pod" generate_structs_pod;
|
||||
output_to "src/guestfs-actions.pod" generate_actions_pod;
|
||||
output_to "src/guestfs-availability.pod" generate_availability_pod;
|
||||
output_to "src/event-string.c" generate_event_string_c;
|
||||
output_to "src/MAX_PROC_NR" generate_max_proc_nr;
|
||||
output_to "src/libguestfs.syms" generate_linker_script;
|
||||
output_to "lib/guestfs.h" generate_guestfs_h;
|
||||
output_to "lib/guestfs-internal-actions.h" generate_internal_actions_h;
|
||||
output_to "lib/bindtests.c" generate_bindtests;
|
||||
output_to "lib/guestfs-structs.pod" generate_structs_pod;
|
||||
output_to "lib/guestfs-actions.pod" generate_actions_pod;
|
||||
output_to "lib/guestfs-availability.pod" generate_availability_pod;
|
||||
output_to "lib/event-string.c" generate_event_string_c;
|
||||
output_to "lib/MAX_PROC_NR" generate_max_proc_nr;
|
||||
output_to "lib/libguestfs.syms" generate_linker_script;
|
||||
|
||||
output_to "src/structs-compare.c" generate_client_structs_compare;
|
||||
output_to "src/structs-copy.c" generate_client_structs_copy;
|
||||
output_to "src/structs-free.c" generate_client_structs_free;
|
||||
output_to "src/actions-variants.c" generate_client_actions_variants;
|
||||
output_to_subset "src/actions-%d.c" generate_client_actions;
|
||||
output_to "lib/structs-compare.c" generate_client_structs_compare;
|
||||
output_to "lib/structs-copy.c" generate_client_structs_copy;
|
||||
output_to "lib/structs-free.c" generate_client_structs_free;
|
||||
output_to "lib/actions-variants.c" generate_client_actions_variants;
|
||||
output_to_subset "lib/actions-%d.c" generate_client_actions;
|
||||
output_to "daemon/actions.h" generate_daemon_actions_h;
|
||||
output_to "daemon/stubs.h" generate_daemon_stubs_h;
|
||||
output_to_subset "daemon/stubs-%d.c" generate_daemon_stubs;
|
||||
|
||||
@@ -44,7 +44,7 @@ virt_get_kernel_CPPFLAGS = \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/gnulib/lib \
|
||||
-I$(top_srcdir)/common/utils \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/fish
|
||||
virt_get_kernel_CFLAGS = \
|
||||
-pthread \
|
||||
@@ -54,13 +54,13 @@ virt_get_kernel_CFLAGS = \
|
||||
BOBJECTS = $(SOURCES_ML:.ml=.cmo)
|
||||
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
|
||||
|
||||
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
|
||||
# -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
|
||||
# option to be passed to gcc, so we don't try linking against an
|
||||
# installed copy of libguestfs.
|
||||
OCAMLPACKAGES = \
|
||||
-package str,unix \
|
||||
-I $(top_builddir)/common/utils/.libs \
|
||||
-I $(top_builddir)/src/.libs \
|
||||
-I $(top_builddir)/lib/.libs \
|
||||
-I $(top_builddir)/gnulib/lib/.libs \
|
||||
-I $(top_builddir)/ocaml \
|
||||
-I $(top_builddir)/mllib
|
||||
|
||||
@@ -52,11 +52,11 @@ 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)/src -I$(srcdir)/include \
|
||||
libguestfs_gobject_1_0_la_CFLAGS = -I$(top_srcdir)/lib -I$(srcdir)/include \
|
||||
-DGUESTFS_PRIVATE=1 \
|
||||
$(GOBJECT_CFLAGS)
|
||||
libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/src
|
||||
libguestfs_gobject_1_0_la_LIBADD = $(top_builddir)/src/libguestfs.la $(GOBJECT_LIBS) $(GIO_LIBS)
|
||||
libguestfs_gobject_1_0_la_LDFLAGS = $(LDFLAGS) -L$(top_builddir)/lib
|
||||
libguestfs_gobject_1_0_la_LIBADD = $(top_builddir)/lib/libguestfs.la $(GOBJECT_LIBS) $(GIO_LIBS)
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libguestfs-gobject-1.0.pc
|
||||
@@ -81,7 +81,7 @@ introspection_sources = \
|
||||
Guestfs-1.0.gir: $(libname)
|
||||
Guestfs_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
|
||||
Guestfs_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/include
|
||||
Guestfs_1_0_gir_LIBS = $(libname) $(top_builddir)/src/libguestfs.la
|
||||
Guestfs_1_0_gir_LIBS = $(libname) $(top_builddir)/lib/libguestfs.la
|
||||
Guestfs_1_0_gir_FILES = $(patsubst %,$(srcdir)/%,$(introspection_sources))
|
||||
INTROSPECTION_GIRS += Guestfs-1.0.gir
|
||||
|
||||
|
||||
@@ -39,10 +39,10 @@ endif ENABLE_APPLIANCE
|
||||
|
||||
#check_DATA = Bindtests
|
||||
|
||||
GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
|
||||
GHCFLAGS = -I$(top_builddir)/lib -L$(top_builddir)/lib/.libs -i$(srcdir)
|
||||
|
||||
all_targets = Guestfs010Load Guestfs030Config Guestfs050LVCreate
|
||||
$(all_targets): $(top_builddir)/src/libguestfs.la
|
||||
$(all_targets): $(top_builddir)/lib/libguestfs.la
|
||||
|
||||
all: $(all_targets)
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ virt_inspector_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -69,7 +69,7 @@ virt_inspector_CFLAGS = \
|
||||
|
||||
virt_inspector_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
|
||||
@@ -35,10 +35,10 @@ exec_prefix=@exec_prefix@
|
||||
find -name 'lt-*' | grep '/.libs/lt-' | xargs -r rm
|
||||
|
||||
# Copy the installed library into libtool directory.
|
||||
rm -f src/.libs/libguestfs.so*
|
||||
cp @libdir@/libguestfs.so src/.libs/
|
||||
cp @libdir@/libguestfs.so.0 src/.libs/
|
||||
cp @libdir@/libguestfs.so.0.* src/.libs/
|
||||
rm -f lib/.libs/libguestfs.so*
|
||||
cp @libdir@/libguestfs.so lib/.libs/
|
||||
cp @libdir@/libguestfs.so.0 lib/.libs/
|
||||
cp @libdir@/libguestfs.so.0.* lib/.libs/
|
||||
|
||||
# Copy installed binaries into the right places.
|
||||
cp @bindir@/libguestfs-test-tool test-tool/
|
||||
@@ -100,7 +100,7 @@ compare () {
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
compare @libdir@/libguestfs.so src/.libs/libguestfs.so
|
||||
compare @libdir@/libguestfs.so lib/.libs/libguestfs.so
|
||||
compare @bindir@/guestfish fish/guestfish
|
||||
compare @bindir@/guestmount fuse/guestmount
|
||||
compare @bindir@/virt-df df/virt-df
|
||||
|
||||
@@ -109,13 +109,13 @@ libguestfs_jni_la_SOURCES = \
|
||||
libguestfs_jni_la_CPPFLAGS = \
|
||||
-DGUESTFS_PRIVATE=1 \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
|
||||
libguestfs_jni_la_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
|
||||
$(JNI_CFLAGS)
|
||||
|
||||
libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
|
||||
libguestfs_jni_la_LIBADD = $(top_builddir)/lib/libguestfs.la
|
||||
|
||||
libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO) -shared
|
||||
|
||||
|
||||
@@ -209,7 +209,7 @@ unit_tests_SOURCES = unit-tests.c
|
||||
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)/src -I.
|
||||
-I$(top_srcdir)/lib -I.
|
||||
unit_tests_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS)
|
||||
# We have to link this to libguestfs, but because we want to test
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* Helper functions for the actions code in F<src/actions-*.c>.
|
||||
* Helper functions for the actions code in F<lib/actions-*.c>.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
@@ -22,9 +22,9 @@
|
||||
* tools (ie. I<all> C code).
|
||||
*
|
||||
* If you need a definition used by only the library, put it in
|
||||
* F<src/guestfs-internal.h> instead. If you need a definition used
|
||||
* F<lib/guestfs-internal.h> instead. If you need a definition used
|
||||
* by only the frontend (non-daemon) parts of libguestfs, try
|
||||
* F<src/guestfs-internal-frontend.h>. If a definition is used by
|
||||
* F<lib/guestfs-internal-frontend.h>. If a definition is used by
|
||||
* only a single tool, it should not be in any shared header file at
|
||||
* all.
|
||||
*/
|
||||
@@ -17,11 +17,11 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* This header file is included in the libguestfs library (F<src/>)
|
||||
* This header file is included in the libguestfs library (F<lib/>)
|
||||
* only.
|
||||
*
|
||||
* See also F<src/guestfs-internal-frontend.h> and
|
||||
* F<src/guestfs-internal-all.h>
|
||||
* See also F<lib/guestfs-internal-frontend.h> and
|
||||
* F<lib/guestfs-internal-all.h>
|
||||
*/
|
||||
|
||||
#ifndef GUESTFS_INTERNAL_H_
|
||||
@@ -387,7 +387,7 @@ struct error_cb_stack {
|
||||
/**
|
||||
* Cache of queried features.
|
||||
*
|
||||
* Used to cache the appliance features (see F<src/available.c>).
|
||||
* Used to cache the appliance features (see F<lib/available.c>).
|
||||
*/
|
||||
struct cached_feature {
|
||||
char *group;
|
||||
@@ -524,7 +524,7 @@ struct guestfs_h {
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBVIRT_BACKEND
|
||||
/* Used by src/libvirt-auth.c. */
|
||||
/* Used by lib/libvirt-auth.c. */
|
||||
#define NR_CREDENTIAL_TYPES 9
|
||||
unsigned int nr_supported_credentials;
|
||||
int supported_credentials[NR_CREDENTIAL_TYPES];
|
||||
@@ -541,7 +541,7 @@ struct guestfs_h {
|
||||
|
||||
/**
|
||||
* Used for storing major.minor.micro version numbers.
|
||||
* See F<src/version.c> for more information.
|
||||
* See F<lib/version.c> for more information.
|
||||
*/
|
||||
struct version {
|
||||
int v_major;
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* This file, and the other C<src/inspect*.c> files, handle
|
||||
* This file, and the other C<lib/inspect*.c> files, handle
|
||||
* inspection. See L<guestfs(3)/INSPECTION>.
|
||||
*/
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
*
|
||||
* Most of the work is done by the backends (see
|
||||
* L<guestfs(3)/BACKEND>), which are implemented in
|
||||
* F<src/launch-direct.c>, F<src/launch-libvirt.c> etc, so this file
|
||||
* F<lib/launch-direct.c>, F<lib/launch-libvirt.c> etc, so this file
|
||||
* mostly passes calls through to the current backend.
|
||||
*/
|
||||
|
||||
@@ -129,7 +129,7 @@ guestfs_impl_launch (guestfs_h *g)
|
||||
*
|
||||
* =item 3.
|
||||
*
|
||||
* There is a hack in F<src/proto.c> to make this work.
|
||||
* There is a hack in F<lib/proto.c> to make this work.
|
||||
*
|
||||
* =back
|
||||
*/
|
||||
@@ -19,7 +19,7 @@
|
||||
/**
|
||||
* This is the code used to send and receive RPC messages and (for
|
||||
* certain types of message) to perform file transfers. This code is
|
||||
* driven from the generated actions (F<src/actions-*.c>). There
|
||||
* driven from the generated actions (F<lib/actions-*.c>). There
|
||||
* are five different cases to consider:
|
||||
*
|
||||
* =over 4
|
||||
@@ -433,7 +433,7 @@ test_stringsbuf (void)
|
||||
guestfs_close (g);
|
||||
}
|
||||
|
||||
/* Use the same macros as in src/drives.c */
|
||||
/* Use the same macros as in lib/drives.c */
|
||||
#define VALID_FORMAT_IFACE(str) \
|
||||
guestfs_int_string_is_valid ((str), 1, 0, \
|
||||
VALID_FLAG_ALPHA|VALID_FLAG_DIGIT, "-_")
|
||||
@@ -42,7 +42,7 @@ libluaguestfs_la_SOURCES = lua-guestfs.c
|
||||
libluaguestfs_la_CPPFLAGS = \
|
||||
-DGUESTFS_PRIVATE=1 \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib
|
||||
|
||||
libluaguestfs_la_CFLAGS = \
|
||||
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
|
||||
@@ -50,7 +50,7 @@ libluaguestfs_la_CFLAGS = \
|
||||
|
||||
libluaguestfs_la_LIBADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LIBVIRT_LIBS) \
|
||||
../gnulib/lib/libgnu.la
|
||||
|
||||
@@ -282,5 +282,5 @@ AC_DEFINE_UNQUOTED([PATH_SEPARATOR],["$PATH_SEPARATOR"],
|
||||
[Character that separates path elements in search paths])
|
||||
|
||||
dnl Library versioning.
|
||||
MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
|
||||
MAX_PROC_NR=`cat $srcdir/lib/MAX_PROC_NR`
|
||||
AC_SUBST(MAX_PROC_NR)
|
||||
|
||||
@@ -31,7 +31,7 @@ virt_make_fs_CPPFLAGS = \
|
||||
-DGUESTFS_WARN_DEPRECATED=1 \
|
||||
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \
|
||||
-I$(top_srcdir)/src -I$(top_builddir)/src \
|
||||
-I$(top_srcdir)/lib -I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/fish \
|
||||
-I$(srcdir)/../gnulib/lib -I../gnulib/lib
|
||||
|
||||
@@ -41,7 +41,7 @@ virt_make_fs_CFLAGS = \
|
||||
|
||||
virt_make_fs_LDADD = \
|
||||
$(top_builddir)/common/utils/libutils.la \
|
||||
$(top_builddir)/src/libguestfs.la \
|
||||
$(top_builddir)/lib/libguestfs.la \
|
||||
$(top_builddir)/fish/libfishcommon.la \
|
||||
$(LIBXML2_LIBS) \
|
||||
$(LTLIBINTL) \
|
||||
|
||||
@@ -111,7 +111,7 @@ libmllib_a_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/common/utils \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/cat \
|
||||
-I$(top_srcdir)/fish
|
||||
libmllib_a_CFLAGS = \
|
||||
@@ -122,13 +122,13 @@ libmllib_a_CFLAGS = \
|
||||
BOBJECTS = $(SOURCES_ML:.ml=.cmo)
|
||||
XOBJECTS = $(BOBJECTS:.cmo=.cmx)
|
||||
|
||||
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
|
||||
# -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
|
||||
# option to be passed to gcc, so we don't try linking against an
|
||||
# installed copy of libguestfs.
|
||||
OCAMLPACKAGES = \
|
||||
-package str,unix \
|
||||
-I $(top_builddir)/common/utils/.libs \
|
||||
-I $(top_builddir)/src/.libs \
|
||||
-I $(top_builddir)/lib/.libs \
|
||||
-I $(top_builddir)/gnulib/lib/.libs \
|
||||
-I $(top_builddir)/ocaml \
|
||||
-I $(builddir)
|
||||
@@ -177,7 +177,7 @@ common_utils_tests_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_builddir) \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/src
|
||||
-I$(top_srcdir)/lib
|
||||
common_utils_tests_BOBJECTS = common_utils_tests.cmo
|
||||
common_utils_tests_XOBJECTS = $(common_utils_tests_BOBJECTS:.cmo=.cmx)
|
||||
|
||||
@@ -186,7 +186,7 @@ getopt_tests_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_builddir) \
|
||||
-I$(shell $(OCAMLC) -where) \
|
||||
-I$(top_srcdir)/src
|
||||
-I$(top_srcdir)/lib
|
||||
getopt_tests_BOBJECTS = getopt_tests.cmo
|
||||
getopt_tests_XOBJECTS = $(getopt_tests_BOBJECTS:.cmo=.cmx)
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user