git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
po-docs: Remove virt-inspector.pl reference from Makefile.am.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
e9b38ea
..
ec84cc5
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-20,7
+20,7
@@
include $(top_srcdir)/subdir-rules.mk
ACLOCAL_AMFLAGS = -I m4
# Basic source for the library.
ACLOCAL_AMFLAGS = -I m4
# Basic source for the library.
-SUBDIRS = gnulib/lib images src examples po
+SUBDIRS = gnulib/lib images
generator
src examples po
if ENABLE_DAEMON
SUBDIRS += daemon
if ENABLE_DAEMON
SUBDIRS += daemon
@@
-33,7
+33,10
@@
endif
SUBDIRS += gnulib/tests capitests regressions test-tool
# Guestfish.
SUBDIRS += gnulib/tests capitests regressions test-tool
# Guestfish.
-SUBDIRS += fish
+SUBDIRS += fish
+
+# virt-tools in C.
+SUBDIRS += cat inspector
# Language bindings.
if HAVE_PERL
# Language bindings.
if HAVE_PERL
@@
-58,11
+61,10
@@
if HAVE_PHP
SUBDIRS += php
endif
SUBDIRS += php
endif
-# Virt-inspector, tools and guestmount.
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
+# Unconditional because nothing is built yet.
+SUBDIRS += csharp
+# Perl tools and guestmount.
if HAVE_TOOLS
SUBDIRS += tools
endif
if HAVE_TOOLS
SUBDIRS += tools
endif
@@
-114,10
+116,11
@@
html/guestfs.3.html: src/guestfs.pod \
--htmldir html \
--outfile $@
--htmldir html \
--outfile $@
-html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
fish/guestfish-commands.pod
mkdir -p html
sed \
-e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
mkdir -p html
sed \
-e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
+ -e '/@FISH_COMMANDS@/rfish/guestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
< $< | \
pod2html \
--css 'pod.css' \
< $< | \
pod2html \
--css 'pod.css' \
@@
-151,7
+154,7
@@
HTMLFILES = \
html/recipes.html \
html/pod.css html/recipes.css
html/recipes.html \
html/pod.css html/recipes.css
-TEXTFILES =
README TODO HACKING
+TEXTFILES =
BUGS HACKING README RELEASE-NOTES TODO
WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
@@
-171,6
+174,12
@@
dist-hook:
$(top_srcdir)/update-bugs > BUGS-t
mv BUGS-t BUGS
cp BUGS $(distdir)/BUGS
$(top_srcdir)/update-bugs > BUGS-t
mv BUGS-t BUGS
cp BUGS $(distdir)/BUGS
+ git log --pretty="format:%an" | sort -u | \
+ grep -v rjones | \
+ grep -v "Richard Jones" \
+ > AUTHORS-t
+ mv AUTHORS-t AUTHORS
+ cp AUTHORS $(distdir)/AUTHORS
# Update the list of translatable files in po/POTFILES.in.
all-local:
# Update the list of translatable files in po/POTFILES.in.
all-local:
@@
-212,9
+221,7
@@
clean-local:
# is NOT a substitute for proper testing!
quickcheck:
# is NOT a substitute for proper testing!
quickcheck:
- LIBGUESTFS_PATH=appliance \
- test-tool/libguestfs-test-tool \
- --helper test-tool/libguestfs-test-tool-helper
+ test-tool/run-test-tool-locally
# Mostly static binary distribution.
#
# Mostly static binary distribution.
#
@@
-242,5
+249,9
@@
bindist:
cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount
$(MAKE) -C test-tool libguestfs-test-tool.static
cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool
cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount
$(MAKE) -C test-tool libguestfs-test-tool.static
cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool
+ $(MAKE) -C cat virt-cat.static
+ cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
+ $(MAKE) -C inspector virt-inspector.static
+ cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
(cd $(BINTMPDIR) && tar cf - .) | \
gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz
(cd $(BINTMPDIR) && tar cf - .) | \
gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz