drop .g ext from gvpr scripts, add get-layers_list, install in <prefix>/share/graphvi...

diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 1fa57b76d9daefaae7b60189c44ce9efa5b15786..1b97b087b567aee09dae083df0b921f94ab2fc60 100644 (file)
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -1,8 +1,9 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-pdfdir = $(pkgdatadir)/doc/pdf
+SUBDIRS = lib
 
+pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \

diff --git a/cmd/gvpr/lib/Makefile.am b/cmd/gvpr/lib/Makefile.am
new file mode 100644 (file)
index 0000000..b77cc89
--- /dev/null
+++ b/cmd/gvpr/lib/Makefile.am
@@ -0,0 +1,13 @@
+# $Id$ $Revision$
+## Process this file with automake to produce Makefile.in
+
+gvprdir = $(pkgdatadir)/gvpr
+
+gvpr_DATA = addranks addrings anon attr bb bbox \
+       cliptree col collapse color dechain deghist \
+       deledges delmulti delnodes depath dijkstra \
+       flatten get-layers-list group indent knbhd \
+       maxdeg path rotate scale scalexy span topon \
+       treetoclust 
+
+EXTRA_DIST = $(gvpr_DATA)

diff --git a/cmd/gvpr/lib/addranks.g b/cmd/gvpr/lib/addranks
similarity index 100%
rename from cmd/gvpr/lib/addranks.g
rename to cmd/gvpr/lib/addranks

diff --git a/cmd/gvpr/lib/addrings.g b/cmd/gvpr/lib/addrings
similarity index 100%
rename from cmd/gvpr/lib/addrings.g
rename to cmd/gvpr/lib/addrings

diff --git a/cmd/gvpr/lib/anon.g b/cmd/gvpr/lib/anon
similarity index 100%
rename from cmd/gvpr/lib/anon.g
rename to cmd/gvpr/lib/anon

diff --git a/cmd/gvpr/lib/attr.g b/cmd/gvpr/lib/attr
similarity index 100%
rename from cmd/gvpr/lib/attr.g
rename to cmd/gvpr/lib/attr

diff --git a/cmd/gvpr/lib/bb.g b/cmd/gvpr/lib/bb
similarity index 100%
rename from cmd/gvpr/lib/bb.g
rename to cmd/gvpr/lib/bb

diff --git a/cmd/gvpr/lib/bbox.g b/cmd/gvpr/lib/bbox
similarity index 100%
rename from cmd/gvpr/lib/bbox.g
rename to cmd/gvpr/lib/bbox

diff --git a/cmd/gvpr/lib/cliptree.g b/cmd/gvpr/lib/cliptree
similarity index 100%
rename from cmd/gvpr/lib/cliptree.g
rename to cmd/gvpr/lib/cliptree

diff --git a/cmd/gvpr/lib/col.g b/cmd/gvpr/lib/col
similarity index 100%
rename from cmd/gvpr/lib/col.g
rename to cmd/gvpr/lib/col

diff --git a/cmd/gvpr/lib/collapse.g b/cmd/gvpr/lib/collapse
similarity index 100%
rename from cmd/gvpr/lib/collapse.g
rename to cmd/gvpr/lib/collapse

diff --git a/cmd/gvpr/lib/color.g b/cmd/gvpr/lib/color
similarity index 100%
rename from cmd/gvpr/lib/color.g
rename to cmd/gvpr/lib/color

diff --git a/cmd/gvpr/lib/dechain.g b/cmd/gvpr/lib/dechain
similarity index 100%
rename from cmd/gvpr/lib/dechain.g
rename to cmd/gvpr/lib/dechain

diff --git a/cmd/gvpr/lib/deghist.g b/cmd/gvpr/lib/deghist
similarity index 100%
rename from cmd/gvpr/lib/deghist.g
rename to cmd/gvpr/lib/deghist

diff --git a/cmd/gvpr/lib/deledges.g b/cmd/gvpr/lib/deledges
similarity index 100%
rename from cmd/gvpr/lib/deledges.g
rename to cmd/gvpr/lib/deledges

diff --git a/cmd/gvpr/lib/delmulti.g b/cmd/gvpr/lib/delmulti
similarity index 100%
rename from cmd/gvpr/lib/delmulti.g
rename to cmd/gvpr/lib/delmulti

diff --git a/cmd/gvpr/lib/delnodes.g b/cmd/gvpr/lib/delnodes
similarity index 100%
rename from cmd/gvpr/lib/delnodes.g
rename to cmd/gvpr/lib/delnodes

diff --git a/cmd/gvpr/lib/depath.g b/cmd/gvpr/lib/depath
similarity index 100%
rename from cmd/gvpr/lib/depath.g
rename to cmd/gvpr/lib/depath

diff --git a/cmd/gvpr/lib/dijkstra.g b/cmd/gvpr/lib/dijkstra
similarity index 100%
rename from cmd/gvpr/lib/dijkstra.g
rename to cmd/gvpr/lib/dijkstra

diff --git a/cmd/gvpr/lib/flatten.g b/cmd/gvpr/lib/flatten
similarity index 100%
rename from cmd/gvpr/lib/flatten.g
rename to cmd/gvpr/lib/flatten

diff --git a/cmd/gvpr/lib/get-layers-list b/cmd/gvpr/lib/get-layers-list
new file mode 100644 (file)
index 0000000..f6d8c65
--- /dev/null
+++ b/cmd/gvpr/lib/get-layers-list
@@ -0,0 +1,13 @@
+BEG_G {
+  char* larr[int];
+  int i;
+  if (!isAttr($,"G","layers")) return;
+  if (isAttr($,"G","layersep"))
+    tokens($.layers,larr,$.layersep);
+  else
+    tokens($.layers,larr," :\t");
+  for (larr[i]) {
+    if (i>0) printf(" %s",larr[i]);
+    else printf("%s",larr[i]);
+  }
+}

diff --git a/cmd/gvpr/lib/group.g b/cmd/gvpr/lib/group
similarity index 100%
rename from cmd/gvpr/lib/group.g
rename to cmd/gvpr/lib/group

diff --git a/cmd/gvpr/lib/indent.g b/cmd/gvpr/lib/indent
similarity index 100%
rename from cmd/gvpr/lib/indent.g
rename to cmd/gvpr/lib/indent

diff --git a/cmd/gvpr/lib/knbhd.g b/cmd/gvpr/lib/knbhd
similarity index 100%
rename from cmd/gvpr/lib/knbhd.g
rename to cmd/gvpr/lib/knbhd

diff --git a/cmd/gvpr/lib/maxdeg.g b/cmd/gvpr/lib/maxdeg
similarity index 100%
rename from cmd/gvpr/lib/maxdeg.g
rename to cmd/gvpr/lib/maxdeg

diff --git a/cmd/gvpr/lib/path.g b/cmd/gvpr/lib/path
similarity index 100%
rename from cmd/gvpr/lib/path.g
rename to cmd/gvpr/lib/path

diff --git a/cmd/gvpr/lib/rotate.g b/cmd/gvpr/lib/rotate
similarity index 100%
rename from cmd/gvpr/lib/rotate.g
rename to cmd/gvpr/lib/rotate

diff --git a/cmd/gvpr/lib/scale.g b/cmd/gvpr/lib/scale
similarity index 100%
rename from cmd/gvpr/lib/scale.g
rename to cmd/gvpr/lib/scale

diff --git a/cmd/gvpr/lib/scalexy.g b/cmd/gvpr/lib/scalexy
similarity index 100%
rename from cmd/gvpr/lib/scalexy.g
rename to cmd/gvpr/lib/scalexy

diff --git a/cmd/gvpr/lib/span.g b/cmd/gvpr/lib/span
similarity index 100%
rename from cmd/gvpr/lib/span.g
rename to cmd/gvpr/lib/span

diff --git a/cmd/gvpr/lib/topon.g b/cmd/gvpr/lib/topon
similarity index 100%
rename from cmd/gvpr/lib/topon.g
rename to cmd/gvpr/lib/topon

diff --git a/cmd/gvpr/lib/treetoclust.g b/cmd/gvpr/lib/treetoclust
similarity index 100%
rename from cmd/gvpr/lib/treetoclust.g
rename to cmd/gvpr/lib/treetoclust

diff --git a/configure.ac b/configure.ac
index 7e9cef20abb2c92a06502e4b49fc59e921e67d65..f6b9a11c7fd9903f87c3cc7411d4c760e443d0d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3325,6 +3325,7 @@ AC_CONFIG_FILES(Makefile
        cmd/dot/Makefile
        cmd/tools/Makefile
        cmd/gvpr/Makefile
+       cmd/gvpr/lib/Makefile
        cmd/lefty/ws/x11/libfilereq/Makefile
        cmd/lefty/ws/x11/Makefile
        cmd/lefty/ws/mswin32/Makefile

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 12d7b8f461a5cd2f7de334c5a1a046900213396e..6a1c5c860bcb9dd7b01cfee5ed015bc2bb420c73 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -213,7 +213,7 @@ fi
 %{_mandir}/man1/*.1*
 %{_mandir}/man7/*.7*
 %dir %{_datadir}/graphviz
-%exclude %{_datadir}/graphviz/lefty
+%{_datadir}/graphviz/gvpr
 %exclude %{_libdir}/graphviz/libgvplugin_gd.*
 %if 0%{?PANGOCAIRO}
 %exclude %{_libdir}/graphviz/libgvplugin_pango.*
@@ -247,7 +247,6 @@ fi
 %endif
 %if 0%{?SMYRNA}
 %exclude %{_bindir}/smyrna
-%exclude %{_datadir}/graphviz/smyrna
 %endif
 
 #-- graphviz-x rpm --------------------------------------------------
@@ -398,8 +397,7 @@ Graphviz applications using _QT - currently just gvedit
 %files qt
 %defattr(-,root,root,-)
 %{_bindir}/gvedit
-%dir %{_datadir}/graphviz/gvedit
-%{_datadir}/graphviz/gvedit/*
+%{_datadir}/graphviz/gvedit
 # %{_mandir}/man1/gvedit.1*
 %endif