diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-03-30 17:03:11 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-03-31 15:42:13 +0100 |
| commit | b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef (patch) | |
| tree | 2c523527cf6d52c719722c2400df1bcbf6bd3699 /cat | |
| parent | 4155d20014b24b2203c4dd8b00e2e19450a7e3bb (diff) | |
| download | libguestfs-b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef.tar.gz libguestfs-b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef.tar.xz libguestfs-b8e1dee73a1deef1bfd5937e2abfbe9afef7b1ef.zip | |
Add /etc/libguestfs-tools.conf configuration file.
This allows the default for --ro or --rw to be controlled for the
three tools guestfish, guestmount and virt-rescue.
Diffstat (limited to 'cat')
| -rw-r--r-- | cat/Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cat/Makefile.am b/cat/Makefile.am index 026a5611..d7bc7e82 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -1,5 +1,5 @@ # libguestfs virt-cat, virt-filesystems and virt-ls. -# Copyright (C) 2010 Red Hat Inc. +# Copyright (C) 2010-2011 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 @@ -33,6 +33,7 @@ CLEANFILES = stamp-virt-cat.pod stamp-virt-ls.pod stamp-virt-filesystems.pod bin_PROGRAMS = virt-cat virt-filesystems virt-ls SHARED_SOURCE_FILES = \ + ../fish/config.c \ ../fish/inspect.c \ ../fish/keys.c \ ../fish/options.h \ @@ -48,9 +49,11 @@ virt_cat_CFLAGS = \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBCONFIG_CFLAGS) virt_cat_LDADD = \ + $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libguestfs.la \ ../gnulib/lib/libgnu.la @@ -63,9 +66,11 @@ virt_filesystems_CFLAGS = \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBCONFIG_CFLAGS) virt_filesystems_LDADD = \ + $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libguestfs.la \ ../gnulib/lib/libgnu.la @@ -78,9 +83,11 @@ virt_ls_CFLAGS = \ -I$(top_srcdir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBCONFIG_CFLAGS) virt_ls_LDADD = \ + $(LIBCONFIG_LIBS) \ $(top_builddir)/src/libguestfs.la \ ../gnulib/lib/libgnu.la |