From: Matthew Fernandez Date: Sat, 26 Sep 2020 01:37:26 +0000 (-0700) Subject: remove explicit output filename in PDF Makefile rules X-Git-Tag: 2.46.0~20^2^2~56^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=602f23db17a838abdbc73db7e7b88ddba68095cd;p=graphviz remove explicit output filename in PDF Makefile rules For all of these rules, the output filename ps2pdf infers is the same as the explicit one being removed, so this change is a no-op. The intent here is to make these invocations compatible with either ps2pdf or pstopdf filling the role of @PS2PDF@. The usage for these two differs slightly: ps2pdf infile [outfile] pstopdf infile [-o outfile] pstopdf is not currently supported -- there is an attempt at this in configure.ac, but it is faulty -- but we plan to support it in an upcoming commit. Related to #1763. --- diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index a40d45aad..e8dd64b1a 100644 --- a/cmd/dot/Makefile.am +++ b/cmd/dot/Makefile.am @@ -75,19 +75,19 @@ uninstall-hook: if HAVE_PS2PDF dot.1.pdf: dot.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< dot.1.ps: $(srcdir)/dot.1 @GROFF@ -Tps -man $< >$@ osage.1.pdf: osage.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< osage.1.ps: $(srcdir)/osage.1 @GROFF@ -Tps -man $< >$@ patchwork.1.pdf: patchwork.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< patchwork.1.ps: $(srcdir)/patchwork.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/dotty/Makefile.am b/cmd/dotty/Makefile.am index be39bcfb2..d6ca856c3 100644 --- a/cmd/dotty/Makefile.am +++ b/cmd/dotty/Makefile.am @@ -34,7 +34,7 @@ endif if HAVE_PS2PDF dotty.1.pdf: dotty.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< dotty.1.ps: $(srcdir)/dotty.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am index 32f3f977c..13611df33 100644 --- a/cmd/edgepaint/Makefile.am +++ b/cmd/edgepaint/Makefile.am @@ -45,7 +45,7 @@ nodist_EXTRA_edgepaint_SOURCES = fake.cxx if HAVE_PS2PDF edgepaint.1.pdf: edgepaint.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< edgepaint.1.ps: $(srcdir)/edgepaint.1 @GROFF@ -e -Tps -man -t $< >$@ diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am index 200095af8..925bb744f 100644 --- a/cmd/gvedit/Makefile.am +++ b/cmd/gvedit/Makefile.am @@ -63,7 +63,7 @@ attrs.txt: $(top_srcdir)/doc/infosrc/attrs if HAVE_PS2PDF gvedit.1.pdf: gvedit.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvedit.1.ps: $(srcdir)/gvedit.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am index 181b70737..fb94c8446 100644 --- a/cmd/gvmap/Makefile.am +++ b/cmd/gvmap/Makefile.am @@ -66,19 +66,19 @@ gvmap.sh : if HAVE_PS2PDF gvmap.1.pdf: gvmap.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvmap.1.ps: $(srcdir)/gvmap.1 @GROFF@ -Tps -man $< >$@ cluster.1.pdf: cluster.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< cluster.1.ps: $(srcdir)/cluster.1 @GROFF@ -Tps -man $< >$@ gvmap.sh.1.pdf: gvmap.sh.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvmap.sh.1.ps: $(srcdir)/gvmap.sh.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am index c4604de1e..0b344cfc2 100644 --- a/cmd/gvpr/Makefile.am +++ b/cmd/gvpr/Makefile.am @@ -40,7 +40,7 @@ gvpr_LDADD = $(top_builddir)/lib/gvpr/libgvpr.la \ if HAVE_PS2PDF gvpr.1.pdf: gvpr.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvpr.1.ps: $(srcdir)/gvpr.1 @GROFF@ -Tps -man -t $< >$@ diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am index 39278b2c2..087b6e7bb 100644 --- a/cmd/lefty/Makefile.am +++ b/cmd/lefty/Makefile.am @@ -96,7 +96,7 @@ endif if HAVE_PS2PDF lefty.1.pdf: lefty.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< lefty.1.ps: $(srcdir)/lefty.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/lneato/Makefile.am b/cmd/lneato/Makefile.am index d5372b243..22fdaae73 100644 --- a/cmd/lneato/Makefile.am +++ b/cmd/lneato/Makefile.am @@ -32,7 +32,7 @@ endif if HAVE_PS2PDF lneato.1.pdf: lneato.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< lneato.1.ps: $(srcdir)/lneato.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am index 5c126204a..b5c133b14 100644 --- a/cmd/mingle/Makefile.am +++ b/cmd/mingle/Makefile.am @@ -46,7 +46,7 @@ nodist_EXTRA_mingle_SOURCES = fake.cxx if HAVE_PS2PDF mingle.1.pdf: mingle.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< mingle.1.ps: $(srcdir)/mingle.1 @GROFF@ -e -Tps -man -t $< >$@ diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am index e140a6aa8..8524e8cc2 100644 --- a/cmd/smyrna/Makefile.am +++ b/cmd/smyrna/Makefile.am @@ -88,7 +88,7 @@ smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \ if HAVE_PS2PDF smyrna.1.pdf: smyrna.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< smyrna.1.ps: $(srcdir)/smyrna.1 @GROFF@ -Tps -man $< >$@ diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am index f1a0212f5..4c0b30e7d 100644 --- a/cmd/tools/Makefile.am +++ b/cmd/tools/Makefile.am @@ -69,7 +69,7 @@ gxl2gv_LDADD = \ if HAVE_PS2PDF gxl2gv.1.pdf: gxl2gv.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gxl2gv.1.ps: $(srcdir)/gxl2gv.1 @GROFF@ -Tps -man $< >$@ @@ -83,7 +83,7 @@ sccmap_LDADD = \ if HAVE_PS2PDF sccmap.1.pdf: sccmap.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< sccmap.1.ps: $(srcdir)/sccmap.1 @GROFF@ -Tps -man $< >$@ @@ -97,7 +97,7 @@ ccomps_LDADD = \ if HAVE_PS2PDF ccomps.1.pdf: ccomps.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< ccomps.1.ps: $(srcdir)/ccomps.1 @GROFF@ -Tps -man $< >$@ @@ -119,7 +119,7 @@ tred_LDADD = \ if HAVE_PS2PDF tred.1.pdf: tred.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< tred.1.ps: $(srcdir)/tred.1 @GROFF@ -Tps -man $< >$@ @@ -133,7 +133,7 @@ unflatten_LDADD = \ if HAVE_PS2PDF unflatten.1.pdf: unflatten.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< unflatten.1.ps: $(srcdir)/unflatten.1 @GROFF@ -Tps -man $< >$@ @@ -147,7 +147,7 @@ acyclic_LDADD = \ if HAVE_PS2PDF acyclic.1.pdf: acyclic.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< acyclic.1.ps: $(srcdir)/acyclic.1 @GROFF@ -Tps -man $< >$@ @@ -161,7 +161,7 @@ nop_LDADD = \ if HAVE_PS2PDF nop.1.pdf: nop.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< nop.1.ps: $(srcdir)/nop.1 @GROFF@ -Tps -man $< >$@ @@ -175,7 +175,7 @@ gvcolor_LDADD = \ if HAVE_PS2PDF gvcolor.1.pdf: gvcolor.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvcolor.1.ps: $(srcdir)/gvcolor.1 @GROFF@ -Tps -man $< >$@ @@ -189,7 +189,7 @@ bcomps_LDADD = \ if HAVE_PS2PDF bcomps.1.pdf: bcomps.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< bcomps.1.ps: $(srcdir)/bcomps.1 @GROFF@ -Tps -man $< >$@ @@ -203,7 +203,7 @@ gc_LDADD = \ if HAVE_PS2PDF gc.1.pdf: gc.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gc.1.ps: $(srcdir)/gc.1 @GROFF@ -Tps -man $< >$@ @@ -240,7 +240,7 @@ endif if HAVE_PS2PDF gvpack.1.pdf: gvpack.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvpack.1.ps: $(srcdir)/gvpack.1 @GROFF@ -Tps -man $< >$@ @@ -257,7 +257,7 @@ mm2gv_LDADD = \ if HAVE_PS2PDF mm2gv.1.pdf: mm2gv.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< mm2gv.1.ps: mm2gv.1 @GROFF@ -Tps -man -e -t $< >$@ @@ -285,7 +285,7 @@ gml2gv_LDADD = \ if HAVE_PS2PDF gml2gv.1.pdf: gml2gv.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gml2gv.1.ps: gml2gv.1 @GROFF@ -Tps -man $< >$@ @@ -300,7 +300,7 @@ graphml2gv_LDADD = \ if HAVE_PS2PDF graphml2gv.1.pdf: graphml2gv.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< graphml2gv.1.ps: $(srcdir)/graphml2gv.1 @GROFF@ -Tps -man $< >$@ @@ -315,7 +315,7 @@ dijkstra_LDADD = \ if HAVE_PS2PDF dijkstra.1.pdf: dijkstra.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< dijkstra.1.ps: $(srcdir)/dijkstra.1 @GROFF@ -Tps -man $< >$@ @@ -328,7 +328,7 @@ gvgen_LDADD = \ if HAVE_PS2PDF gvgen.1.pdf: gvgen.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvgen.1.ps: $(srcdir)/gvgen.1 @GROFF@ -Tps -man $< >$@ diff --git a/contrib/diffimg/Makefile.am b/contrib/diffimg/Makefile.am index c4c3ae1c1..1e09b38d3 100644 --- a/contrib/diffimg/Makefile.am +++ b/contrib/diffimg/Makefile.am @@ -26,7 +26,7 @@ diffimg_LDADD = @GDLIB_LIBS@ @MATH_LIBS@ if HAVE_PS2PDF diffimg.1.pdf: diffimg.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< diffimg.1.ps: $(srcdir)/diffimg.1 @GROFF@ -Tps -man $< >$@ diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am index 61985b249..04939fbf0 100644 --- a/contrib/prune/Makefile.am +++ b/contrib/prune/Makefile.am @@ -28,7 +28,7 @@ prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs_C.la \ if HAVE_PS2PDF prune.1.pdf: prune.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< prune.1.ps: prune.1 @GROFF@ -Tps -man $< >$@ diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am index a99f8a6c9..e7828c11e 100644 --- a/lib/cdt/Makefile.am +++ b/lib/cdt/Makefile.am @@ -32,7 +32,7 @@ libcdt_la_SOURCES = $(libcdt_C_la_SOURCES) if HAVE_PS2PDF cdt.3.pdf: cdt.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< cdt.3.ps: $(srcdir)/cdt.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am index bb8ff7d9f..37e2fa361 100644 --- a/lib/cgraph/Makefile.am +++ b/lib/cgraph/Makefile.am @@ -40,7 +40,7 @@ grammar.c grammar.h: $(top_srcdir)/lib/cgraph/grammar.y if HAVE_PS2PDF cgraph.3.pdf: cgraph.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< cgraph.3.ps: $(srcdir)/cgraph.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am index 260592aea..1b883cc13 100644 --- a/lib/expr/Makefile.am +++ b/lib/expr/Makefile.am @@ -67,7 +67,7 @@ y.output: $(top_srcdir)/lib/expr/exparse.y if HAVE_PS2PDF expr.3.pdf: expr.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< expr.3.ps: $(srcdir)/expr.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am index 1e2ced00a..3186e68be 100644 --- a/lib/gvc/Makefile.am +++ b/lib/gvc/Makefile.am @@ -75,7 +75,7 @@ endif if HAVE_PS2PDF gvc.3.pdf: gvc.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvc.3.ps: $(srcdir)/gvc.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am index 3ec99cac3..c37e0d9f4 100644 --- a/lib/gvpr/Makefile.am +++ b/lib/gvpr/Makefile.am @@ -43,7 +43,7 @@ libgvpr_C_la_DEPENDENCIES = \ if HAVE_PS2PDF gvpr.3.pdf: gvpr.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gvpr.3.ps: $(srcdir)/gvpr.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am index 0add98c33..586992279 100644 --- a/lib/inkpot/Makefile.am +++ b/lib/inkpot/Makefile.am @@ -77,13 +77,13 @@ $(top_builddir)/lib/inkpot/inkpot_lib_brewer.dat: inkpot_lib_brewer.tcl data/bre if HAVE_PS2PDF inkpot.1.pdf: inkpot.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< inkpot.1.ps: inkpot.1 @GROFF@ -Tps -man $< >$@ inkpot.3.pdf: inkpot.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< inkpot.3.ps: inkpot.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am index 845f0f016..24b276565 100644 --- a/lib/pack/Makefile.am +++ b/lib/pack/Makefile.am @@ -33,7 +33,7 @@ libpack_C_la_SOURCES = ccomps.c pack.c if HAVE_PS2PDF pack.3.pdf: pack.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< pack.3.ps: $(srcdir)/pack.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am index 10396c793..b7854c002 100644 --- a/lib/pathplan/Makefile.am +++ b/lib/pathplan/Makefile.am @@ -36,7 +36,7 @@ libpathplan_la_LIBADD = @MATH_LIBS@ if HAVE_PS2PDF pathplan.3.pdf: pathplan.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< pathplan.3.ps: $(srcdir)/pathplan.3 @GROFF@ -Tps -man $< >$@ diff --git a/lib/xdot/Makefile.am b/lib/xdot/Makefile.am index 75e924d32..141e065b6 100644 --- a/lib/xdot/Makefile.am +++ b/lib/xdot/Makefile.am @@ -29,7 +29,7 @@ libxdot_la_SOURCES = $(libxdot_C_la_SOURCES) if HAVE_PS2PDF xdot.3.pdf: xdot.3.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< xdot.3.ps: $(srcdir)/xdot.3 @GROFF@ -Tps -man $< >$@ diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am index 63ff0b005..f1b0e13f0 100644 --- a/plugin/xlib/Makefile.am +++ b/plugin/xlib/Makefile.am @@ -35,7 +35,7 @@ endif if HAVE_PS2PDF vimdot.1.pdf: vimdot.1.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< vimdot.1.ps: $(srcdir)/vimdot.1 @GROFF@ -Tps -man $< >$@ diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am index 2969a29ca..e18464b44 100644 --- a/tclpkg/gdtclft/Makefile.am +++ b/tclpkg/gdtclft/Makefile.am @@ -53,7 +53,7 @@ endif if HAVE_PS2PDF gdtclft.3tcl.pdf: gdtclft.3tcl.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gdtclft.3tcl.ps: $(srcdir)/gdtclft.3tcl @GROFF@ -Tps -man $< >$@ diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index 6a1c52f1d..5f073c947 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -427,79 +427,79 @@ $(man): gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl if HAVE_PS2PDF gv.3sharp.pdf: gv.3sharp.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3sharp.ps: gv.3sharp @GROFF@ -Tps -man $< >$@ gv.3go.pdf: gv.3go.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3go.ps: gv.3go @GROFF@ -Tps -man $< >$@ gv.3guile.pdf: gv.3guile.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3guile.ps: gv.3guile @GROFF@ -Tps -man $< >$@ gv.3io.pdf: gv.3io.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3io.ps: gv.3io @GROFF@ -Tps -man $< >$@ gv.3java.pdf: gv.3java.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3java.ps: gv.3java @GROFF@ -Tps -man $< >$@ gv.3lua.pdf: gv.3lua.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3lua.ps: gv.3lua @GROFF@ -Tps -man $< >$@ gv.3ocaml.pdf: gv.3ocaml.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3ocaml.ps: gv.3ocaml @GROFF@ -Tps -man $< >$@ gv.3perl.pdf: gv.3perl.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3perl.ps: gv.3perl @GROFF@ -Tps -man $< >$@ gv.3php.pdf: gv.3php.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3php.ps: gv.3php @GROFF@ -Tps -man $< >$@ gv.3python.pdf: gv.3python.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3python.ps: gv.3python @GROFF@ -Tps -man $< >$@ gv.3r.pdf: gv.3r.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3r.ps: gv.3r @GROFF@ -Tps -man $< >$@ gv.3ruby.pdf: gv.3ruby.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3ruby.ps: gv.3ruby @GROFF@ -Tps -man $< >$@ gv.3tcl.pdf: gv.3tcl.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< gv.3tcl.ps: gv.3tcl @GROFF@ -Tps -man $< >$@ diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am index 46eb8889e..d4c4e132b 100644 --- a/tclpkg/tcldot/Makefile.am +++ b/tclpkg/tcldot/Makefile.am @@ -118,7 +118,7 @@ endif if HAVE_PS2PDF tcldot.3tcl.pdf: tcldot.3tcl.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< tcldot.3tcl.ps: $(srcdir)/tcldot.3tcl @GROFF@ -Tps -man $< >$@ diff --git a/tclpkg/tkspline/Makefile.am b/tclpkg/tkspline/Makefile.am index b8aaaa794..a80e2c218 100644 --- a/tclpkg/tkspline/Makefile.am +++ b/tclpkg/tkspline/Makefile.am @@ -45,7 +45,7 @@ endif if HAVE_PS2PDF tkspline.3tk.pdf: tkspline.3tk.ps - @PS2PDF@ $< $@ + @PS2PDF@ $< tkspline.3tk.ps: $(srcdir)/tkspline.3tk @GROFF@ -Tps -man $< >$@