git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inspector: Fix rule to build HTML file.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
8a58ea7
..
ec84cc5
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-35,6
+35,9
@@
SUBDIRS += gnulib/tests capitests regressions test-tool
# Guestfish.
SUBDIRS += fish
# Guestfish.
SUBDIRS += fish
+# virt-tools in C.
+SUBDIRS += cat inspector
+
# Language bindings.
if HAVE_PERL
SUBDIRS += perl
# Language bindings.
if HAVE_PERL
SUBDIRS += 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
@@
-118,7
+120,7
@@
html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestf
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@/rguestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
+ -e '/@FISH_COMMANDS@/r
fish/
guestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
< $< | \
pod2html \
--css 'pod.css' \
< $< | \
pod2html \
--css 'pod.css' \
@@
-172,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:
@@
-241,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