Move unconditional `man_MANS` -> `dist_man_MANS`

* Avoids the repetition in `EXTRA_DIST`, and is the recommended
  Automake pattern.
* Some `man_MANS` will have to remain, since Automake has a bug
  where `dist_man_MANS` in Automake branches do not get included
  in the tarball:
    https://lists.gnu.org/archive/html/bug-automake/2008-06/msg00019.html

diff --git a/Makefile.am b/Makefile.am
index e96449f166bd1adf0021cfd1d91edcbbbe152370..ad2ff49e46e60d0e42575fe811e6088b470ca119 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ html_DATA = $(html)
 
 pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
 
-man_MANS = graphviz.7
+dist_man_MANS = graphviz.7
 
 # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
 SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests
@@ -33,7 +33,7 @@ EXTRA_DIST = $(html) graphviz.spec \
        autogen.sh config/depcomp config/config.rpath \
        builddate.h \
        m4/README m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
-       graphviz.7 Doxyfile.in Doxyfile \
+       Doxyfile.in Doxyfile \
        config/config_perl.pl \
        config/config_ruby.rb config/config_tcl.tcl dot.demo plugin.demo \
        macosx windows debian redhat graphviz.sln

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 339b9d2651cc69f7e6b4f68de11d13d033e86aa4..f835aa0cb80e0ba63ef6b06475f6e98e3e29bfac 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -45,7 +45,7 @@ bin_PROGRAMS = dot_static
 endif
 endif
 
-man_MANS = dot.1 osage.1 patchwork.1
+dist_man_MANS = dot.1 osage.1 patchwork.1
 if ENABLE_MAN_PDFS
 pdf_DATA = dot.1.pdf osage.1.pdf patchwork.1.pdf
 endif
@@ -128,6 +128,6 @@ endif
 nodist_EXTRA_dot_static_SOURCES = fake.cxx
 nodist_EXTRA_dot_builtins_SOURCES = fake.cxx
 
-EXTRA_DIST = dot.1 osage.1 patchwork.1 dot.vcxproj*
+EXTRA_DIST = dot.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am
index cbcf0c20444f49ea8adab3f5175e2313970986ec..6e238f59d3c495b8a20bdf57b60576eae718796a 100644 (file)
--- a/cmd/edgepaint/Makefile.am
+++ b/cmd/edgepaint/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 
 bin_PROGRAMS = edgepaint
 
-man_MANS = edgepaint.1
+dist_man_MANS = edgepaint.1
 if ENABLE_MAN_PDFS
 pdf_DATA = edgepaint.1.pdf
 endif
@@ -38,6 +38,6 @@ nodist_EXTRA_edgepaint_SOURCES = fake.cxx
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .1 .1.pdf
 
-EXTRA_DIST = $(man_MANS) edgepaint.vcxproj*
+EXTRA_DIST = edgepaint.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 32a9323df4ad1f39154aea627a7e4dab2ad4b810..7f5055633bf6b8ddf47a6681c12ada7c116578ec 100644 (file)
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -14,7 +14,7 @@ else
 bin_PROGRAMS = gvpr
 endif
 
-man_MANS = gvpr.1
+dist_man_MANS = gvpr.1
 if ENABLE_MAN_PDFS
 pdf_DATA = gvpr.1.pdf
 endif
@@ -44,6 +44,6 @@ gvpr_static_LDADD = \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(MATH_LIBS)
 
-EXTRA_DIST = $(man_MANS) lib gvpr.vcxproj*
+EXTRA_DIST = lib gvpr.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index a2c43991dbdf539dd6d7f65f789473ab0a174d95..442e0adc2c53585d0d0528a211cf18a30ddb9c2d 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -15,14 +15,14 @@ AM_CPPFLAGS = \
        $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS) $(XRENDER_CFLAGS)
 
 bin_PROGRAMS =
-man_MANS =
 if ENABLE_SHARED
 bin_PROGRAMS += smyrna
 endif
 if ENABLE_STATIC
 bin_PROGRAMS += smyrna_static
 endif
-man_MANS += smyrna.1
+
+dist_man_MANS = smyrna.1
 if ENABLE_MAN_PDFS
 pdf_DATA = smyrna.1.pdf
 endif
@@ -82,6 +82,6 @@ smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .1 .1.pdf
 
-EXTRA_DIST = smyrna.vcxproj* $(man_MANS) smyrna.1
+EXTRA_DIST = smyrna.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index b4c73a2605aaced092b1efbc80e1c2926d9008da..3f432ea0ce0631f4eee5ca6a5ec46ba0ef882d3b 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = gc gvcolor gxl2gv acyclic nop ccomps sccmap tred \
        unflatten gvpack dijkstra bcomps mm2gv gvgen gml2gv gv2gml graphml2gv
 endif
 
-man_MANS = gc.1 gvcolor.1 gxl2gv.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
+dist_man_MANS = gc.1 gvcolor.1 gxl2gv.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
        tred.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1 mm2gv.1 gvgen.1 gml2gv.1 graphml2gv.1
 if ENABLE_MAN_PDFS
 pdf_DATA = gc.1.pdf gvcolor.1.pdf gxl2gv.1.pdf acyclic.1.pdf \
@@ -216,7 +216,7 @@ gvgen_SOURCES = gvgen.c graph_generator.c
 gvgen_LDADD = \
        $(top_builddir)/lib/cgraph/libcgraph.la $(MATH_LIBS)
 
-EXTRA_DIST = $(man_MANS) bcomps.vcxproj* \
+EXTRA_DIST = bcomps.vcxproj* \
        acyclic.vcxproj* bcomps.vcxproj* ccomps.vcxproj* dijkstra.vcxproj* gc.vcxproj* \
        gvcolor.vcxproj* gvgen.vcxproj* gvpack.vcxproj* gxl2gv.vcxproj* \
        mm2gv.vcxproj* nop.vcxproj* sccmap.vcxproj* tred.vcxproj* unflatten.vcxproj* \

diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index 54e63c6af96a9523574f3505088c403adad573d9..7042c192d4250cdead1226a2d54008a90a831085 100644 (file)
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 
 bin_PROGRAMS = prune
 noinst_HEADERS = generic_list.h
-man_MANS = prune.1
+dist_man_MANS = prune.1
 if ENABLE_MAN_PDFS
 pdf_DATA = prune.1.pdf
 endif
@@ -25,6 +25,6 @@ prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .1 .1.pdf
 
-EXTRA_DIST = $(man_MANS) README test.gv prune.vcxproj*
+EXTRA_DIST = README test.gv prune.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index 044224d9e017565e99ffbe74292d57fe739c10ac..24d3883949db8f8f98f8f229f1cea47e44a01209 100644 (file)
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -14,7 +14,7 @@ pkginclude_HEADERS = cdt.h
 noinst_HEADERS = dthdr.h
 noinst_LTLIBRARIES = libcdt_C.la
 lib_LTLIBRARIES = libcdt.la
-man_MANS = cdt.3
+dist_man_MANS = cdt.3
 if ENABLE_MAN_PDFS
 pdf_DATA = cdt.3.pdf
 endif
@@ -33,6 +33,6 @@ libcdt_la_SOURCES = $(libcdt_C_la_SOURCES)
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS) cdt.vcxproj*
+EXTRA_DIST = cdt.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index 0449061a3be7476642fdab285052d8bbb3d78530..6895321f7b1dd23aa81a40f2784fb8915fd39c9b 100644 (file)
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS = agxbuf.h alloc.h bitarray.h cghdr.h exit.h itos.h likely.h \
 noinst_LTLIBRARIES = libcgraph_C.la
 lib_LTLIBRARIES = libcgraph.la
 pkgconfig_DATA = libcgraph.pc
-man_MANS = cgraph.3
+dist_man_MANS = cgraph.3
 if ENABLE_MAN_PDFS
 pdf_DATA = cgraph.3.pdf
 endif
@@ -41,7 +41,7 @@ grammar.c grammar.h: $(top_srcdir)/lib/cgraph/grammar.y
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS) cmpnd.c \
+EXTRA_DIST = cmpnd.c \
        grammar.c grammar.h scan.c \
        cgraph.vcxproj*
 

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 3a889f78529d8139c06271239b1d88ebc0f9ee34..073d7a9259671e0dc635bb473ea1696cb4406b7e 100644 (file)
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
 noinst_HEADERS = exgram.h exlib.h exop.h exparse.h expr.h
 noinst_LTLIBRARIES = libexpr_C.la
 
-man_MANS = expr.3
+dist_man_MANS = expr.3
 if ENABLE_MAN_PDFS
 pdf_DATA = expr.3.pdf
 endif
@@ -43,7 +43,7 @@ y.output: $(top_srcdir)/lib/expr/exparse.y
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS) \
+EXTRA_DIST = \
        exparse.c \
        y.tab.c y.tab.h y.output expr.vcxproj*
 

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index d4a8e5e5e4e7004f94ac67a7a62d5b21e14060c6..62cee8cfbda59d437c9ec27b98235e260a08d70d 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -24,7 +24,7 @@ noinst_HEADERS = gvcint.h gvcproc.h gvio.h
 noinst_LTLIBRARIES = libgvc_C.la
 lib_LTLIBRARIES = libgvc.la
 pkgconfig_DATA = libgvc.pc
-man_MANS = gvc.3
+dist_man_MANS = gvc.3
 if ENABLE_MAN_PDFS
 pdf_DATA = gvc.3.pdf
 endif
@@ -64,6 +64,4 @@ libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS)
-
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index ccb45c55d71194ae4abe6fbb8ad29ba504fe2999..a4b1799524c8a5a55c594adc23953b790a6f8c5a 100644 (file)
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -29,7 +29,7 @@ noinst_HEADERS = actions.h compile.h gdefs.h gprdata.inc gprstate.h parse.h \
 noinst_LTLIBRARIES = libgvpr_C.la
 lib_LTLIBRARIES = libgvpr.la
 pkgconfig_DATA = libgvpr.pc
-man_MANS = gvpr.3
+dist_man_MANS = gvpr.3
 if ENABLE_MAN_PDFS
 pdf_DATA = gvpr.3.pdf
 endif
@@ -60,6 +60,6 @@ if WITH_WIN32
 libgvpr_la_LDFLAGS += -export-symbols-regex gvpr
 endif
 
-EXTRA_DIST = $(man_MANS) trie.c gvprlib.vcxproj*
+EXTRA_DIST = trie.c gvprlib.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index 16f1277ac02beba939982cf8a50f7310c724ca70..e8434f525518e041387358f9defddb8507b20d76 100644 (file)
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -14,7 +14,7 @@ endif
 
 pkginclude_HEADERS = pack.h
 noinst_LTLIBRARIES = libpack_C.la
-man_MANS = pack.3
+dist_man_MANS = pack.3
 if ENABLE_MAN_PDFS
 pdf_DATA = pack.3.pdf
 endif
@@ -27,6 +27,4 @@ libpack_C_la_SOURCES = ccomps.c pack.c
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS)
-
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am
index df092ea28bf9b0a01736edd9cebd333ee136f67a..ea78832577e457151c1ebfd5ea45bfb6fbe3ac91 100644 (file)
--- a/lib/pathplan/Makefile.am
+++ b/lib/pathplan/Makefile.am
@@ -15,7 +15,7 @@ noinst_HEADERS = pathutil.h solvers.h tri.h vis.h vispath.h
 noinst_LTLIBRARIES = libpathplan_C.la
 lib_LTLIBRARIES = libpathplan.la
 pkgconfig_DATA = libpathplan.pc
-man_MANS = pathplan.3
+dist_man_MANS = pathplan.3
 if ENABLE_MAN_PDFS
 pdf_DATA = pathplan.3.pdf
 endif
@@ -33,6 +33,6 @@ libpathplan_la_LIBADD = $(MATH_LIBS)
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS) Pathplan.vcxproj*
+EXTRA_DIST = Pathplan.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)

diff --git a/lib/xdot/Makefile.am b/lib/xdot/Makefile.am
index 471a34b0af4ada23d00c429c0f0618e4c20b6ed0..3dd1f90cddfb0608d66a62dc4cd1ea24885afee8 100644 (file)
--- a/lib/xdot/Makefile.am
+++ b/lib/xdot/Makefile.am
@@ -10,7 +10,7 @@ noinst_LTLIBRARIES = libxdot_C.la
 lib_LTLIBRARIES = libxdot.la
 pkgconfig_DATA = libxdot.pc
 
-man_MANS = xdot.3
+dist_man_MANS = xdot.3
 if ENABLE_MAN_PDFS
 pdf_DATA = xdot.3.pdf
 endif
@@ -25,6 +25,6 @@ libxdot_la_SOURCES = $(libxdot_C_la_SOURCES)
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3 .3.pdf
 
-EXTRA_DIST = $(man_MANS) xdot.vcxproj*
+EXTRA_DIST = xdot.vcxproj*
 
 DISTCLEANFILES = $(pdf_DATA)