cleanup: fix make distclean in doc

RRD*.pod were in the repository, but were always generated and were
removed by "make distclean", resulting in an unexpected response from
"git status".  Resolve this by removing them from the repository.

Also eliminate the wildcards from CLEANFILES, instead explicitly listing
all derived files.

Also add a couple files to EXTRADIST (PDF documentation and the RRD*.pod
files).

Signed-off-by: Peter A. Bigot <pab@pabigot.com>

diff --git a/.gitignore b/.gitignore
index b859e1c71ec31b9a57176f8c0f049117d5bdab03..6035261c1d260c8fa99457b8f97d7eae9e9adcb6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ Makefile
 /doc/*.1
 /doc/*.3
 /doc/pod2*.tmp
+/doc/RRD?.pod

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0d908bd5153a917362836d1a893c45f89cd8cc05..bb4c565c825a929b2a28f93ab3d8da5f2f8ca4d6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,8 +6,6 @@ AUTOMAKE_OPTIONS        =  foreign
 
 #ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
 
-CLEANFILES = *.1 *.3 *.html *.txt *-dircache RRD?.pod *.pdf *~ core *itemcache *.rej *.orig *.tmp
-
 POD = bin_dec_hex.pod        rrddump.pod            rrdgraph_examples.pod  rrdrestore.pod         rrdupdate.pod  \
       cdeftutorial.pod       rrdfetch.pod           rrdgraph_graph.pod     rrdthreads.pod         rrdxport.pod   \
       rpntutorial.pod        rrdfirst.pod           rrdgraph_rpn.pod       rrdtool.pod            rrdcached.pod  \
@@ -34,8 +32,11 @@ TXT = $(MAN:.1=.txt) $(MAN3:.3=.txt)
 HTML = $(POD:.pod=.html) $(POD3:.pod=.html) $(PMP:.pod=.html)
 PDF = $(MAN:.1=.pdf) $(MAN3:.3=.pdf)
 
+GENERATED_EXTRADIST = $(HTML) $(MAN) $(MAN3) $(TXT) $(PMP) $(PDF)
+CLEANFILES = $(GENERATED_EXTRADIST) pod2htm*.tmp
+
 # what should go into the distribution
-EXTRA_DIST= $(POD) $(POD3) $(HTML) $(MAN) $(MAN3) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod
+EXTRA_DIST= $(GENERATED_EXTRADIST) $(POD) $(POD3) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod
 
 idocdir = $(RRDDOCDIR)/txt
 idoc_DATA = $(POD) $(TXT)

diff --git a/doc/RRDp.pod b/doc/RRDp.pod
deleted file mode 120000 (symlink)
index 11703f7..0000000
--- a/doc/RRDp.pod
+++ /dev/null
@@ -1 +0,0 @@
-../bindings/perl-piped/RRDp.pm
\ No newline at end of file

diff --git a/doc/RRDs.pod b/doc/RRDs.pod
deleted file mode 120000 (symlink)
index 30a99d2..0000000
--- a/doc/RRDs.pod
+++ /dev/null
@@ -1 +0,0 @@
-../bindings/perl-shared/RRDs.pm
\ No newline at end of file