git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator: Support testing the output of RHashtable functions.
[libguestfs.git]
/
cat
/
Makefile.am
diff --git
a/cat/Makefile.am
b/cat/Makefile.am
index
026a561
..
3180b26
100644
(file)
--- a/
cat/Makefile.am
+++ b/
cat/Makefile.am
@@
-1,5
+1,5
@@
# libguestfs virt-cat, virt-filesystems and virt-ls.
# 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
#
# 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
@@
-13,18
+13,15
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# 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.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \
include $(top_srcdir)/subdir-rules.mk
EXTRA_DIST = \
- run-cat-locally \
test-virt-cat.sh \
virt-cat.pod \
test-virt-cat.sh \
virt-cat.pod \
- run-filesystems-locally \
test-virt-filesystems.sh \
virt-filesystems.pod \
test-virt-filesystems.sh \
virt-filesystems.pod \
- run-ls-locally \
test-virt-ls.sh \
virt-ls.pod
test-virt-ls.sh \
virt-ls.pod
@@
-33,6
+30,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 = \
bin_PROGRAMS = virt-cat virt-filesystems virt-ls
SHARED_SOURCE_FILES = \
+ ../fish/config.c \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
../fish/inspect.c \
../fish/keys.c \
../fish/options.h \
@@
-44,13
+42,16
@@
virt_cat_SOURCES = \
virt-cat.c
virt_cat_CFLAGS = \
virt-cat.c
virt_cat_CFLAGS = \
+ -DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/fish \
-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-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 = \
virt_cat_LDADD = \
+ $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libguestfs.la \
../gnulib/lib/libgnu.la
$(top_builddir)/src/libguestfs.la \
../gnulib/lib/libgnu.la
@@
-59,13
+60,16
@@
virt_filesystems_SOURCES = \
virt-filesystems.c
virt_filesystems_CFLAGS = \
virt-filesystems.c
virt_filesystems_CFLAGS = \
+ -DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/fish \
-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-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 = \
virt_filesystems_LDADD = \
+ $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libguestfs.la \
../gnulib/lib/libgnu.la
$(top_builddir)/src/libguestfs.la \
../gnulib/lib/libgnu.la
@@
-74,13
+78,16
@@
virt_ls_SOURCES = \
virt-ls.c
virt_ls_CFLAGS = \
virt-ls.c
virt_ls_CFLAGS = \
+ -DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/fish \
-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-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 = \
virt_ls_LDADD = \
+ $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libguestfs.la \
../gnulib/lib/libgnu.la
$(top_builddir)/src/libguestfs.la \
../gnulib/lib/libgnu.la
@@
-95,7
+102,7
@@
noinst_DATA = \
virt-cat.1 $(top_builddir)/html/virt-cat.1.html: stamp-virt-cat.pod
stamp-virt-cat.pod: virt-cat.pod
virt-cat.1 $(top_builddir)/html/virt-cat.1.html: stamp-virt-cat.pod
stamp-virt-cat.pod: virt-cat.pod
- $(top_
src
dir)/podwrapper.sh \
+ $(top_
build
dir)/podwrapper.sh \
--man virt-cat.1 \
--html $(top_builddir)/html/virt-cat.1.html \
$<
--man virt-cat.1 \
--html $(top_builddir)/html/virt-cat.1.html \
$<
@@
-104,7
+111,7
@@
stamp-virt-cat.pod: virt-cat.pod
virt-ls.1 $(top_builddir)/html/virt-ls.1.html: stamp-virt-ls.pod
stamp-virt-ls.pod: virt-ls.pod
virt-ls.1 $(top_builddir)/html/virt-ls.1.html: stamp-virt-ls.pod
stamp-virt-ls.pod: virt-ls.pod
- $(top_
src
dir)/podwrapper.sh \
+ $(top_
build
dir)/podwrapper.sh \
--man virt-ls.1 \
--html $(top_builddir)/html/virt-ls.1.html \
$<
--man virt-ls.1 \
--html $(top_builddir)/html/virt-ls.1.html \
$<
@@
-113,7
+120,7
@@
stamp-virt-ls.pod: virt-ls.pod
virt-filesystems.1 $(top_builddir)/html/virt-filesystems.1.html: stamp-virt-filesystems.pod
stamp-virt-filesystems.pod: virt-filesystems.pod
virt-filesystems.1 $(top_builddir)/html/virt-filesystems.1.html: stamp-virt-filesystems.pod
stamp-virt-filesystems.pod: virt-filesystems.pod
- $(top_
src
dir)/podwrapper.sh \
+ $(top_
build
dir)/podwrapper.sh \
--man virt-filesystems.1 \
--html $(top_builddir)/html/virt-filesystems.1.html \
$<
--man virt-filesystems.1 \
--html $(top_builddir)/html/virt-filesystems.1.html \
$<
@@
-126,6
+133,7
@@
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh
TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh