The original mail i tried to send was far too large, so here's it
edited to remove the boring bits.
Daniel
From: "Daniel P. Berrange" <berrange(a)redhat.com>
To: libvir-list(a)redhat.com
Cc: "Daniel P. Berrange" <berrange(a)redhat.com>
Subject: [PATCH] Remove some auto-generated files
Date: Thu, 8 Oct 2009 17:03:07 +0100
Removes some auto-generated files still under version control.
It also moves the rule for generating NEWS into the Makefile.am
that's in the same directory as the output file to avoid confusion
* docs/libvirt-api.xml, docs/libvirt-refs.xml, NEWS: Remove
auto-generated files from source control
* Makefile.am: Add rule for generating NEWS file
* docs/Makefile.am: Remove rule for generating NEWS file
---
Makefile.am | 9 +
NEWS | 1620 ----------
docs/Makefile.am | 10 +-
docs/libvirt-api.xml | 2986 ------------------
docs/libvirt-refs.xml | 8313 -------------------------------------------------
5 files changed, 10 insertions(+), 12928 deletions(-)
delete mode 100644 NEWS
delete mode 100644 docs/libvirt-api.xml
delete mode 100644 docs/libvirt-refs.xml
diff --git a/Makefile.am b/Makefile.am
index add7e2a..977ad0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,15 @@ EXTRA_DIST = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libvirt.pc
+NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
+ -@(if [ -x $(XSLTPROC) ] ; then \
+ $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl \
+ $(top_srcdir)/docs/news.html.in \
+ | perl -0777 -pe 's/\n\n+$$/\n/' \
+ | perl -pe 's/[ \t]+$$//' \
+ > $@-t && mv $@-t $@ ; fi );
+
+
rpm: clean
@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8832b72..0c206c3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -80,7 +80,7 @@ EXTRA_DIST= \
CLEANFILES = $(dot_html) $(apihtml) $(devhelphtml)
-all: web $(top_builddir)/NEWS
+all: web
api: libvirt-api.xml libvirt-refs.xml
@@ -133,14 +133,6 @@ libvirt-api.xml libvirt-refs.xml: apibuild.py \
$(srcdir)/../src/libvirt.c $(srcdir)/../src/util/virterror.c
-(./apibuild.py)
-$(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
- -@(if [ -x $(XSLTPROC) ] ; then \
- $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl \
- $(top_srcdir)/docs/news.html.in \
- | perl -0777 -pe 's/\n\n+$$/\n/' \
- | perl -pe 's/[ \t]+$$//' \
- > $@-t && mv $@-t $@ ; fi );
-
clean-local:
rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
----- End forwarded message -----
--
|: Red Hat, Engineering, London -o-
http://people.redhat.com/berrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org -o-
http://ovirt.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|