From 78ee1141b5958d0872a8ffada0f37729e06624e2 Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Fri, 16 May 2014 09:42:49 -0500 Subject: [PATCH] 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 --- .gitignore | 1 + doc/Makefile.am | 7 ++++--- doc/RRDp.pod | 1 - doc/RRDs.pod | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 120000 doc/RRDp.pod delete mode 120000 doc/RRDs.pod diff --git a/.gitignore b/.gitignore index b859e1c7..6035261c 100644 --- 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 0d908bd5..bb4c565c 100644 --- 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 index 11703f76..00000000 --- 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 index 30a99d2c..00000000 --- a/doc/RRDs.pod +++ /dev/null @@ -1 +0,0 @@ -../bindings/perl-shared/RRDs.pm \ No newline at end of file -- 2.47.2