Fix inconsistent whitespace

diff --git a/Makefile.am b/Makefile.am
index 5e72359e16a8471a2acd8d880776013b82ebffd8..0acf4a564e925cd0209b7f39b24804dca69a331f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST = $(txt) $(html) graphviz.spec \
        m4/README m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
        graphviz.7 Doxyfile.in Doxyfile awk \
        config/config_perl.pl \
-       config/config_ruby.rb config/config_tcl.tcl dot.demo  plugin.demo \
+       config/config_ruby.rb config/config_tcl.tcl dot.demo plugin.demo \
        macosx windows debian redhat graphviz.sln
 
 .PHONY: rpm
@@ -52,13 +52,13 @@ rpm: dist
        Red) cp redhat/graphviz.spec.rhel $(HOME)/rpmbuild/$(HOSTNAME)/SPECS/graphviz.spec;; \
        esac
        rpmbuild -ba $(HOME)/rpmbuild/$(HOSTNAME)/SPECS/graphviz.spec
-       
+
 .PHONY: deb
 deb: dist
        rm -rf graphviz-$(VERSION)
        zcat graphviz-$(VERSION).tar.gz | tar xf -
        (cd graphviz-$(VERSION); fakeroot make -f debian/rules binary)
-       
+
 .PHONY: pkg
 pkg: dist
        tar xzf graphviz-$(VERSION).tar.gz && make -C graphviz-$(VERSION)/macosx/build && mv graphviz-$(VERSION)/macosx/build/graphviz-*.pkg .

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index cb9a6ded34dd9ab6a5fe710d1fd75520984c42a2..0aa5d94621f001809ad56388c3e58eaccc92d838 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -9,7 +9,7 @@ else
 linkedpdf =
 endif
 linkedprogram = neato$(EXEEXT) twopi$(EXEEXT) fdp$(EXEEXT) circo$(EXEEXT) \
-    osage$(EXEEXT) patchwork$(EXEEXT)
+       osage$(EXEEXT) patchwork$(EXEEXT)
 
 if WITH_SFDP
 linkedman += sfdp.1
@@ -21,8 +21,8 @@ endif
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt

diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am
index b89afc03c808d1f3918da45a6f5a5e69da03e08d..04bd3eae3e0e9f1652410c6b81ed880180743990 100644 (file)
--- a/cmd/edgepaint/Makefile.am
+++ b/cmd/edgepaint/Makefile.am
@@ -26,8 +26,8 @@ endif
 edgepaint_SOURCES = edgepaintmain.c
 edgepaint_CPPFLAGS = $(AM_CPPFLAGS)
 edgepaint_LDADD = \
-    $(top_builddir)/lib/edgepaint/libedgepaint_C.la \
-    $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/edgepaint/libedgepaint_C.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la \
        $(top_builddir)/lib/neatogen/libneatogen_C.la \
        $(top_builddir)/lib/sparse/libsparse_C.la \

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 07c9cfd49fbfa8e0abf3aa611d68e97c2920a04a..a2a0012f640dc1ddfa85dafe6f6141a187188fe6 100644 (file)
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -46,9 +46,9 @@ gvedit_LDADD = \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(QTGUI_LIBS) \
        $(QTCORE_LIBS) \
-       $(EXPAT_LIBS) $(Z_LIBS) 
+       $(EXPAT_LIBS) $(Z_LIBS)
 
-noinst_HEADERS = csettings.h imageviewer.h mainwindow.h mdichild.h ui_settings.h 
+noinst_HEADERS = csettings.h imageviewer.h mainwindow.h mdichild.h ui_settings.h
 
 MOCABLES = moc_csettings.cpp moc_imageviewer.cpp moc_mainwindow.cpp moc_mdichild.cpp qrc_mdi.cpp
 
@@ -80,7 +80,6 @@ endif
 EXTRA_DIST = gvedit.vcxproj* gvedit.pro.in mdi.qrc $(mans) $(pdfs)
 
 CLEANFILES = moc_csettings.cpp moc_imageviewer.cpp moc_mainwindow.cpp moc_mdichild.cpp qrc_mdi.cpp
-
 DISTCLEANFILES = attrs.txt $(pdf) qMakefile gvedit.1.ps
 
 clean-local:

diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am
index c652373e084c1569d1f8d76c42e0c231d590f494..43304ceaa1a398f4cd6373c5c25038ec7938fc0c 100644 (file)
--- a/cmd/gvmap/Makefile.am
+++ b/cmd/gvmap/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cdt
 
 if WITH_SFDP
-bin_PROGRAMS = gvmap cluster 
+bin_PROGRAMS = gvmap cluster
 dist_bin_SCRIPTS = gvmap.sh
 endif
 
@@ -30,7 +30,7 @@ noinst_HEADERS = make_map.h power.h country_graph_coloring.h
 
 gvmap_SOURCES = gvmap.c make_map.c power.c country_graph_coloring.c
 
-cluster_SOURCES = cluster.c make_map.c power.c country_graph_coloring.c 
+cluster_SOURCES = cluster.c make_map.c power.c country_graph_coloring.c
 
 gvmap_CPPFLAGS = $(AM_CPPFLAGS)
 

diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 8a9139a6c7b07fe7feb3646faaeb06e386b827c1..7422596f5bfca6b2b66185abbc4123195a9166bd 100644 (file)
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -55,7 +55,7 @@ gvpr_static_LDADD = \
        $(top_builddir)/lib/ast/libast_C.la \
        $(top_builddir)/lib/cgraph/libcgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(MATH_LIBS)
+       $(MATH_LIBS)
 
 EXTRA_DIST = $(man_MANS) $(pdf) lib gvpr.vcxproj*
 

diff --git a/cmd/gvpr/lib/Makefile.am b/cmd/gvpr/lib/Makefile.am
index d8cebe3f7d46e21a82dbb8ea6a6c235a24e90926..cf3a7aa1c0f89c2bc93c7389a665c0150179c867 100644 (file)
--- a/cmd/gvpr/lib/Makefile.am
+++ b/cmd/gvpr/lib/Makefile.am
@@ -7,6 +7,6 @@ gvpr_DATA = addedges addranks addrings anon attr bb bbox bipart binduce chkclust
        deledges delmulti delnodes depath dijkstra \
        flatten get-layers-list histogram group indent knbhd \
        maxdeg path rotate scale scalexy span topon \
-       treetoclust 
+       treetoclust
 
 EXTRA_DIST = $(gvpr_DATA)

diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index 3ffd8ac5158ec681ce37d80a15ed0a3e927698db..b54c1f9ec8798a18bf94d5e860b9a2429a56da2e 100644 (file)
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -28,8 +28,8 @@ endif
 mingle_SOURCES = minglemain.cpp
 mingle_CPPFLAGS = $(AM_CPPFLAGS)
 mingle_LDADD = \
-    $(top_builddir)/lib/mingle/libmingle_C.la \
-    $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/mingle/libmingle_C.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la \
        $(top_builddir)/lib/neatogen/libneatogen_C.la \
        $(top_builddir)/lib/sparse/libsparse_C.la \

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index d953f6acae873457e5c5014c6c64ab9db8952fa7..a597dee8be944d45184a63ed86d900020c9d3f56 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -4,23 +4,23 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
        -DSMYRNA_PATH=\""$(pkgdatadir)/smyrna"\" \
-        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/cgraph \
-        -I$(top_srcdir)/lib/cdt \
-        -I$(top_srcdir)/lib/gvc \
-        -I$(top_srcdir)/lib/xdot \
-        -I$(top_srcdir)/lib/gvpr \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/cmd/smyrna/gui \
-        $(GTK_CFLAGS:-I%=-isystem%) \
+       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/lib/cgraph \
+       -I$(top_srcdir)/lib/cdt \
+       -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/xdot \
+       -I$(top_srcdir)/lib/gvpr \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/pathplan \
+       -I$(top_srcdir)/cmd/smyrna/gui \
+       $(GTK_CFLAGS:-I%=-isystem%) \
        $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS) $(XRENDER_CFLAGS)
 
 bin_PROGRAMS =
-man_MANS = 
-pdf_DATA = 
+man_MANS =
+pdf_DATA =
 if ENABLE_SHARED
-bin_PROGRAMS += smyrna 
+bin_PROGRAMS += smyrna
 endif
 if ENABLE_STATIC
 bin_PROGRAMS += smyrna_static
@@ -61,33 +61,33 @@ smyrna_SOURCES = arcball.c draw.c glexpose.c \
        gui/toolboxcallbacks.c gui/topviewsettings.c glutrender.c
 
 smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
-               $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(top_builddir)/lib/xdot/libxdot_C.la \
-               $(top_builddir)/lib/glcomp/libglcomp_C.la \
-               $(top_builddir)/lib/topfish/libtopfish_C.la \
-               $(top_builddir)/lib/common/libcommon_C.la \
-               $(top_builddir)/lib/gvc/libgvc_C.la \
-               $(top_builddir)/lib/gvpr/libgvpr_C.la \
-               $(top_builddir)/lib/expr/libexpr_C.la \
-               $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-               $(top_builddir)/lib/neatogen/libneatogen_C.la \
-               $(top_builddir)/lib/pathplan/libpathplan_C.la \
-               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(X_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(MATH_LIBS) $(EXTRA_SMYRNA_LDFLAGS)
+       $(top_builddir)/lib/cdt/libcdt_C.la \
+       $(top_builddir)/lib/xdot/libxdot_C.la \
+       $(top_builddir)/lib/glcomp/libglcomp_C.la \
+       $(top_builddir)/lib/topfish/libtopfish_C.la \
+       $(top_builddir)/lib/common/libcommon_C.la \
+       $(top_builddir)/lib/gvc/libgvc_C.la \
+       $(top_builddir)/lib/gvpr/libgvpr_C.la \
+       $(top_builddir)/lib/expr/libexpr_C.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/neatogen/libneatogen_C.la \
+       $(top_builddir)/lib/pathplan/libpathplan_C.la \
+       $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(X_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(MATH_LIBS) $(EXTRA_SMYRNA_LDFLAGS)
 
 smyrna_static_SOURCES = $(smyrna_SOURCES)
 smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
-               $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(top_builddir)/lib/xdot/libxdot_C.la \
-               $(top_builddir)/lib/glcomp/libglcomp_C.la \
-               $(top_builddir)/lib/topfish/libtopfish_C.la \
-               $(top_builddir)/lib/common/libcommon_C.la \
-               $(top_builddir)/lib/gvc/libgvc_C.la \
-               $(top_builddir)/lib/gvpr/libgvpr_C.la \
-               $(top_builddir)/lib/expr/libexpr_C.la \
-               $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-               $(top_builddir)/lib/neatogen/libneatogen_C.la \
-               $(top_builddir)/lib/pathplan/libpathplan_C.la \
-               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(X_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(MATH_LIBS)
+       $(top_builddir)/lib/cdt/libcdt_C.la \
+       $(top_builddir)/lib/xdot/libxdot_C.la \
+       $(top_builddir)/lib/glcomp/libglcomp_C.la \
+       $(top_builddir)/lib/topfish/libtopfish_C.la \
+       $(top_builddir)/lib/common/libcommon_C.la \
+       $(top_builddir)/lib/gvc/libgvc_C.la \
+       $(top_builddir)/lib/gvpr/libgvpr_C.la \
+       $(top_builddir)/lib/expr/libexpr_C.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/neatogen/libneatogen_C.la \
+       $(top_builddir)/lib/pathplan/libpathplan_C.la \
+       $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(X_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
@@ -102,4 +102,3 @@ endif
 EXTRA_DIST = smyrna.vcxproj* $(man_MANS) $(pdf) smyrna.1
 
 DISTCLEANFILES = $(pdf) smyrna.1.ps
-

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index cc8a2f0340364460bdc5eb50ccd161a10c5ae11a..f9645362dc5bca1b30732c26a03528e16045ab46 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
 pdfdir = $(pkgdatadir)/doc/pdf
 
 noinst_HEADERS = colortbl.h convert.h mmio.h matrix_market.h \
-        graph_generator.h gml2gv.h gmlparse.h
+       graph_generator.h gml2gv.h gmlparse.h
 if ENABLE_STATIC
 bin_PROGRAMS = gc gvcolor gxl2gv acyclic nop ccomps sccmap tred \
        unflatten gvpack gvpack_static dijkstra bcomps mm2gv gvgen gml2gv gv2gml graphml2gv
@@ -26,9 +26,9 @@ 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 \
-          nop.1.pdf ccomps.1.pdf sccmap.1.pdf tred.1.pdf \
-          unflatten.1.pdf gvpack.1.pdf dijkstra.1.pdf \
-          bcomps.1.pdf mm2gv.1.pdf gvgen.1.pdf gml2gv.1.pdf graphml2gv.1.pdf
+       nop.1.pdf ccomps.1.pdf sccmap.1.pdf tred.1.pdf \
+       unflatten.1.pdf gvpack.1.pdf dijkstra.1.pdf \
+       bcomps.1.pdf mm2gv.1.pdf gvgen.1.pdf gml2gv.1.pdf graphml2gv.1.pdf
 
 if HAVE_PS2PDF
 pdf = $(pdf_DATA)
@@ -77,7 +77,7 @@ gxl2gv_LDADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
-       $(top_builddir)/lib/cdt/libcdt.la $(EXPAT_LIBS) 
+       $(top_builddir)/lib/cdt/libcdt.la $(EXPAT_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
@@ -93,7 +93,7 @@ sccmap_SOURCES = sccmap.c
 
 sccmap_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(top_builddir)/lib/cgraph/libcgraph.la $(EXPAT_LIBS) 
+       $(top_builddir)/lib/cgraph/libcgraph.la $(EXPAT_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
@@ -124,7 +124,7 @@ endif
 tred_SOURCES = tred.c
 
 tred_LDADD = \
-    $(top_builddir)/lib/gvc/libgvc.la \
+       $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/cgraph/libcgraph.la
 
@@ -258,7 +258,7 @@ gvpack_static_LDADD = \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/cgraph/libcgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+       $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 # add a non-existent C++ source to force the C++ compiler to be used for
 # linking, so the C++ standard library is included for our C++ dependencies
@@ -279,9 +279,9 @@ mm2gv_SOURCES = mm2gv.c matrix_market.c mmio.c
 
 mm2gv_LDADD = \
        $(top_builddir)/lib/sparse/libsparse_C.la \
-    $(top_builddir)/lib/common/libcommon_C.la \
-    $(top_builddir)/lib/gvc/libgvc_C.la \
-    $(top_builddir)/lib/pathplan/libpathplan_C.la \
+       $(top_builddir)/lib/common/libcommon_C.la \
+       $(top_builddir)/lib/gvc/libgvc_C.la \
+       $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/cgraph/libcgraph.la $(MATH_LIBS)
 
 if ENABLE_MAN_PDFS
@@ -305,7 +305,7 @@ gml2gv_SOURCES = gml2gv.c gmlparse.y gmlscan.l
 
 gmlparse.c gmlparse.h: $(top_srcdir)/cmd/tools/gmlparse.y
        $(YACC) -Wno-yacc -dv $(top_srcdir)/cmd/tools/gmlparse.y -o gmlparse.c
- 
+
 gmlparse.o gmlparse.lo gmlscan.o gmlscan.lo : gmlscan.c gmlparse.h
 
 gmlscan.c: $(top_srcdir)/cmd/tools/gmlscan.l
@@ -330,7 +330,7 @@ graphml2gv_SOURCES = graphml2gv.c
 graphml2gv_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
-       $(top_builddir)/lib/cdt/libcdt.la $(EXPAT_LIBS) 
+       $(top_builddir)/lib/cdt/libcdt.la $(EXPAT_LIBS)
 
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
@@ -376,13 +376,12 @@ endif
 
 EXTRA_DIST = $(man_MANS) $(pdf) bcomps.vcxproj* \
        acyclic.vcxproj* bcomps.vcxproj* ccomps.vcxproj* dijkstra.vcxproj* gc.vcxproj* \
-    gvcolor.vcxproj* gvgen.vcxproj* gvpack.vcxproj* gxl2gv.vcxproj* \
+       gvcolor.vcxproj* gvgen.vcxproj* gvpack.vcxproj* gxl2gv.vcxproj* \
        mm2gv.vcxproj* nop.vcxproj* sccmap.vcxproj* tred.vcxproj* unflatten.vcxproj* \
        gmlscan.c gmlparse.c gmlparse.h gml2gv.vcxproj* \
        graphml2gv.vcxproj* gv2gml.vcxproj*
 
-CLEANFILES = stamp.h 
-
+CLEANFILES = stamp.h
 DISTCLEANFILES = $(pdf) gmlparse.[ch] gmlscan.c \
        gxl2gv.1.ps sccmap.1.ps ccomps.1.ps tred.1.ps unflatten.1.ps acyclic.1.ps \
        nop.1.ps gvcolor.1.ps bcomps.1.ps gc.1.ps gvpack.1.ps mm2gv.1.ps gml2gv.1.ps \

diff --git a/contrib/diffimg/Makefile.am b/contrib/diffimg/Makefile.am
index 33ed7e8412994cf8ea2630693171d625af2c676c..7b04e830ca6f898ed50eb8398b99ffa696249714 100644 (file)
--- a/contrib/diffimg/Makefile.am
+++ b/contrib/diffimg/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-VERSION=0.2
+VERSION = 0.2
 
 AM_CPPFLAGS = \
        $(GDLIB_CFLAGS) \

diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index ecebc5a5559c9dbd5402c6543c26b48a73c56855..937dc63e57bad6bb18e93ba74cf02dddb7a0e099 100644 (file)
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -3,8 +3,8 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir) \
-        -I$(top_srcdir)/lib/ingraphs \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/lib/ingraphs \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt
 
@@ -41,5 +41,4 @@ endif
 
 EXTRA_DIST = $(man_MANS) $(pdf) README test.gv prune.vcxproj*
 
-
 DISTCLEANFILES = $(pdf) prune.1.ps

diff --git a/doc/info/Makefile.am b/doc/info/Makefile.am
index 46fd432ee2d110a7b465d352c96ddbe970e889b4..1a20c21e57064322696e0662bd47869cc9e47c10 100644 (file)
--- a/doc/info/Makefile.am
+++ b/doc/info/Makefile.am
@@ -3,6 +3,6 @@
 htmldir = $(pkgdatadir)/doc/html/info
 
 html_DATA = attrs.html colors.html command.html \
-  index.html lang.html output.html shapes.html arrows.html
+       index.html lang.html output.html shapes.html arrows.html
 
 EXTRA_DIST = $(html_DATA)

diff --git a/doc/schema/Makefile.am b/doc/schema/Makefile.am
index abdefa3b3853134fb44c153bcf3f3d4c0e13c5be..48c68759867a9f0e05129535f479991779de1055 100644 (file)
--- a/doc/schema/Makefile.am
+++ b/doc/schema/Makefile.am
@@ -2,6 +2,6 @@
 
 schemadir = $(pkgdatadir)/doc/html/schema
 
-schema_DATA =  arguments.xml  attributes.xml  attributes.xslt
+schema_DATA = arguments.xml attributes.xml attributes.xslt
 
 EXTRA_DIST = $(schema_DATA)

diff --git a/graphs/directed/Makefile.am b/graphs/directed/Makefile.am
index 412bc81c2d43ee3a6846d4f6b1eac30ce2ac1a9a..6741ac3fd2e58f9b069d3ebf8ccbf27af42c2f42 100644 (file)
--- a/graphs/directed/Makefile.am
+++ b/graphs/directed/Makefile.am
@@ -17,7 +17,7 @@ directed_DATA = $(GRAPHS)
 
 EXTRA_DIST = $(GRAPHS)
 
-CLEANFILES = core *.gv.* *.png .xvpics/* 
+CLEANFILES = core *.gv.* *.png .xvpics/*
 
 DOT = $(top_builddir)/cmd/dot/dot_builtins
 
@@ -29,17 +29,17 @@ test:
                -Tpng:cairo -Tpng:gd -Tpng:cairo:gd -Tpng:cairo:cairo -Tpng:gd:gd \
                -Tps -Tps:lasi -Tps2 -Tps:cairo -Tpdf \
                -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
-               -O $(GRAPHS) 
+               -O $(GRAPHS)
 
 ins_test:
        dot \
-                -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
-                -Tcmap -Tcmapx -Tismap -Timap \
-                -Tjpg -Tpdf -Tfig -Tgif -Tpng \
+               -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
+               -Tcmap -Tcmapx -Tismap -Timap \
+               -Tjpg -Tpdf -Tfig -Tgif -Tpng \
                -Tpng:cairo -Tpng:gd -Tpng:cairo:gd -Tpng:cairo:cairo -Tpng:gd:gd \
-                -Tps -Tps2 -Tps:lasi -Tps:cairo -Tpdf \
-                -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
-                -O $(GRAPHS) 
+               -Tps -Tps2 -Tps:lasi -Tps:cairo -Tpdf \
+               -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
+               -O $(GRAPHS)
 
 canon:
        for i in $(GRAPHS); do echo "dot $$i"; \

diff --git a/graphs/undirected/Makefile.am b/graphs/undirected/Makefile.am
index 0cc52f59aafe1ee41d94c7e4353576fe3c9da7b5..e2758600b471be4651461623b8a9af04ee802807 100644 (file)
--- a/graphs/undirected/Makefile.am
+++ b/graphs/undirected/Makefile.am
@@ -8,7 +8,7 @@ undirected_DATA = $(GRAPHS)
 
 EXTRA_DIST = $(GRAPHS)
 
-CLEANFILES = core *.gv.* *.png .xvpics/* 
+CLEANFILES = core *.gv.* *.png .xvpics/*
 
 DOT = $(top_builddir)/cmd/dot/dot_builtins
 
@@ -19,7 +19,7 @@ test:
                -Tjpg -Tpdf -Tfig -Tgif -Tpng \
                -Tps -Tps2 -Tps:lasi -Tps:cairo -Tpdf \
                -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
-               -O $(GRAPHS) 
+               -O $(GRAPHS)
 
 canon:
        for i in $(GRAPHS); do echo "neato $$i"; \

diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index 5459d29c602e3cc59b6aa2a2b8eeb9cd4bad3603..8199943fb61a1f46f9f3e804115237db41c79116 100644 (file)
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-CDT_VERSION="5:0:0"
+CDT_VERSION = "5:0:0"
 
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgextraincludedir = $(pkgincludedir)

diff --git a/lib/cgraph/Makefile.am b/lib/cgraph/Makefile.am
index 8869d15f7905edf517f3877019732012fa14f7b0..fd6d2bac133e9864aa5919163fc195be6c631c64 100644 (file)
--- a/lib/cgraph/Makefile.am
+++ b/lib/cgraph/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-CGRAPH_VERSION="6:0:0"
+CGRAPH_VERSION = "6:0:0"
 
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index f8e77601d870552264db4e42733f5c165826861b..ae9bea30ed3cf532944caaa0c4baf17aedb80ef1 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -3,13 +3,13 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/gvc \
-        -I$(top_srcdir)/lib/pack \
-        -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/lib/cgraph \
-        -I$(top_srcdir)/lib/cdt
+       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/pack \
+       -I$(top_srcdir)/lib/pathplan \
+       -I$(top_srcdir)/lib/cgraph \
+       -I$(top_srcdir)/lib/cdt
 
 if WITH_WIN32
 AM_CFLAGS = -DNEATOGEN_EXPORTS=1

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index e93d55a56377864e98c93123158a0991c79a6f7c..745944d35591954d7d9ed15f0cc400ff5d7a44da 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -39,23 +39,23 @@ colxlate.o colxlate.lo : colortbl.h
 colortbl.h : color_lib
        $(AWK) -f $(top_srcdir)/awk/colortbl.awk color_lib > colortbl.h
 
-# ensure color names are properly sorted for bsearch operation 
+# ensure color names are properly sorted for bsearch operation
 color_lib : brewer_lib svgcolor_lib $(top_srcdir)/lib/common/color_names
        cat brewer_lib svgcolor_lib $(top_srcdir)/lib/common/color_names | LC_ALL=C $(SORT) > color_lib
 
-brewer_lib : $(top_srcdir)/lib/common/brewer_colors  $(top_srcdir)/awk/brewer.awk
+brewer_lib : $(top_srcdir)/lib/common/brewer_colors $(top_srcdir)/awk/brewer.awk
        $(AWK) -f $(top_srcdir)/awk/brewer.awk $(top_srcdir)/lib/common/brewer_colors > brewer_lib
 
 if WITH_CYGWIN
 AWK_OPTIONS=-v RS="\r*\n"
 endif
 
-svgcolor_lib : $(top_srcdir)/lib/common/svgcolor_names  $(top_srcdir)/awk/svgcolor.awk
-        $(AWK) $(AWK_OPTIONS) -f $(top_srcdir)/awk/svgcolor.awk $(top_srcdir)/lib/common/svgcolor_names > svgcolor_lib
+svgcolor_lib : $(top_srcdir)/lib/common/svgcolor_names $(top_srcdir)/awk/svgcolor.awk
+       $(AWK) $(AWK_OPTIONS) -f $(top_srcdir)/awk/svgcolor.awk $(top_srcdir)/lib/common/svgcolor_names > svgcolor_lib
 
 htmllex.o htmllex.lo: htmllex.c htmllex.h htmlparse.h
 htmlparse.o htmlparse.lo: htmlparse.c htmlparse.h
-                                                                                
+
 htmlparse.c htmlparse.h: $(top_srcdir)/lib/common/htmlparse.y
        $(YACC) -Wno-yacc -dv $(top_srcdir)/lib/common/htmlparse.y -o htmlparse.c
 

diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index 5ec2587a0cf5492c7f84504e5ec81de0369f42fa..1a0da9bcf48cf2eb4c6d96e2169d8e20a1a36d89 100644 (file)
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/Makefile.am
@@ -2,9 +2,9 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/pack \
-        -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/pack \
+       -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt \
        -I$(top_srcdir)/lib/pathplan

diff --git a/lib/edgepaint/Makefile.am b/lib/edgepaint/Makefile.am
index d103a06236c7b0c2aed25d77df884a270ea36c66..e4caa910160f9c6a7b159f49caa38f820789e339 100644 (file)
--- a/lib/edgepaint/Makefile.am
+++ b/lib/edgepaint/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-LAB_GAMUT_VERSION="1:0:0"
+LAB_GAMUT_VERSION = "1:0:0"
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -12,13 +12,13 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt
 
-noinst_HEADERS =  edge_distinct_coloring.h  furtherest_point.h  intersection.h  lab_gamut.h  lab.h  node_distinct_coloring.h
+noinst_HEADERS = edge_distinct_coloring.h furtherest_point.h intersection.h lab_gamut.h lab.h node_distinct_coloring.h
 
 noinst_LTLIBRARIES = libedgepaint_C.la
 lib_LTLIBRARIES = liblab_gamut.la
 pkgconfig_DATA = liblab_gamut.pc
 
-libedgepaint_C_la_SOURCES = edge_distinct_coloring.c  furtherest_point.c  intersection.c  lab.c  node_distinct_coloring.c
+libedgepaint_C_la_SOURCES = edge_distinct_coloring.c furtherest_point.c intersection.c lab.c node_distinct_coloring.c
 
 liblab_gamut_la_LDFLAGS = -version-info $(LAB_GAMUT_VERSION) -no-undefined
 liblab_gamut_la_SOURCES = lab_gamut.c

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 24950b238a21387f276ec2b219e16cfdcf4764c3..edc0a03a139ba505d85855e08035350a951d0c11 100644 (file)
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-EXPR_VERSION="4:0:0"
+EXPR_VERSION = "4:0:0"
 
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
@@ -28,7 +28,7 @@ endif
 
 libexpr_C_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
        exeval.c exexpr.c exopen.c extoken.c \
-       extype.c exzero.c exparse.y exnospace.c exstash.c 
+       extype.c exzero.c exparse.y exnospace.c exstash.c
 libexpr_C_la_LIBADD = \
        $(top_builddir)/lib/ast/libast_C.la \
        $(top_builddir)/lib/vmalloc/libvmalloc_C.la \
@@ -38,7 +38,7 @@ libexpr_C_la_LIBADD = \
 $(libexpr_C_la_OBJECTS) $(libexpr_la_OBJECTS): \
        exparse.h exparse.c exgram.h exop.h
 
-exparse.c: y.tab.c 
+exparse.c: y.tab.c
        $(SED) "s/fprintf/sfprintf/g" <y.tab.c | \
                $(SED) "s/FILE/Sfio_t/g" | \
                $(SED) "s/stderr/sfstderr/g" > exparse.c

diff --git a/lib/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am
index 6c4421341a1b7f2077f0dbadbb9849095acd1fac..703bed521af4e5bd078ee4870897fdd8fd5dcff1 100644 (file)
--- a/lib/fdpgen/Makefile.am
+++ b/lib/fdpgen/Makefile.am
@@ -1,13 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/gvc \
-        -I$(top_srcdir)/lib/pack \
-        -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/lib/cgraph \
-        -I$(top_srcdir)/lib/cdt
+       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/pack \
+       -I$(top_srcdir)/lib/pathplan \
+       -I$(top_srcdir)/lib/cgraph \
+       -I$(top_srcdir)/lib/cdt
 
 if WITH_WIN32
 AM_CFLAGS = -DNEATOGEN_EXPORTS=1

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 186769004440e3e0f10288343e8cfc95cb77d6e7..5d020c203928d05d64e41dd45dc30d095cab0546 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-GVC_VERSION="6:0:0"
+GVC_VERSION = "6:0:0"
 
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
@@ -56,7 +56,7 @@ libgvc_C_la_DEPENDENCIES = \
        $(top_builddir)/lib/common/libcommon_C.la
 if WITH_ORTHO
 libgvc_C_la_LIBADD += $(top_builddir)/lib/ortho/libortho_C.la
-libgvc_C_la_DEPENDENCIES +=  $(top_builddir)/lib/ortho/libortho_C.la
+libgvc_C_la_DEPENDENCIES += $(top_builddir)/lib/ortho/libortho_C.la
 endif
 if ENABLE_LTDL
 libgvc_C_la_LIBADD += $(LIBLTDL) $(LIBLTDL_LDFLAGS)

diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index dd2067320d157fc9dedeb5373274b80c6295d6d0..335e8a9d05660e8f96a271d5bf340b6349f1a613 100644 (file)
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -3,7 +3,7 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 HOSTCC ?= $(CC)
-GVPR_VERSION="2:0:0"
+GVPR_VERSION = "2:0:0"
 
 if WITH_MINGW
 # Add an extra forward slash in front of $(pkgdatadir) to avoid the
@@ -46,7 +46,7 @@ else
 pdf =
 endif
 
-libgvpr_C_la_SOURCES = actions.c compile.c gvpr.c gprstate.c parse.c queue.c 
+libgvpr_C_la_SOURCES = actions.c compile.c gvpr.c gprstate.c parse.c queue.c
 libgvpr_C_la_DEPENDENCIES = \
        $(top_builddir)/lib/expr/libexpr_C.la \
        $(top_builddir)/lib/common/libcommon_C.la \

diff --git a/lib/ingraphs/Makefile.am b/lib/ingraphs/Makefile.am
index 234dc2a339208fea6f1de1538ef480890fbd40b0..f583dc78020c5b5ee7694736d5d72d50e74eddce 100644 (file)
--- a/lib/ingraphs/Makefile.am
+++ b/lib/ingraphs/Makefile.am
@@ -2,10 +2,10 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/cgraph \
-       -I$(top_srcdir)/lib/cdt 
+       -I$(top_srcdir)/lib/cgraph \
+       -I$(top_srcdir)/lib/cdt
 
-noinst_HEADERS = ingraphs.h 
+noinst_HEADERS = ingraphs.h
 noinst_LTLIBRARIES = libingraphs_C.la
 
 libingraphs_C_la_SOURCES = ingraphs.c

diff --git a/lib/label/Makefile.am b/lib/label/Makefile.am
index 32eccc94d5bdd428ee343729ff6d65192043743f..184f2ce777cb1b920d9fda546767da0d2db5f468 100644 (file)
--- a/lib/label/Makefile.am
+++ b/lib/label/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
-    -I$(top_srcdir)/lib/cdt
+       -I$(top_srcdir)/lib/cdt
 
 if WITH_WIN32
 AM_CFLAGS = -DGVC_EXPORTS=1

diff --git a/lib/mingle/Makefile.am b/lib/mingle/Makefile.am
index 47b8651322b97cc489b0942d8e73d58760156943..f6ee51972d651494f4bb3388f09f26ec001f6c23 100644 (file)
--- a/lib/mingle/Makefile.am
+++ b/lib/mingle/Makefile.am
@@ -8,14 +8,13 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt $(ANN_CFLAGS)
 
-noinst_HEADERS =  edge_bundling.h ink.h agglomerative_bundling.h nearest_neighbor_graph.h nearest_neighbor_graph_ann.h
+noinst_HEADERS = edge_bundling.h ink.h agglomerative_bundling.h nearest_neighbor_graph.h nearest_neighbor_graph_ann.h
 
 if WITH_ANN
 noinst_LTLIBRARIES = libmingle_C.la
 endif
 
 libmingle_C_la_SOURCES = edge_bundling.cpp ink.cpp agglomerative_bundling.cpp \
-  nearest_neighbor_graph.cpp nearest_neighbor_graph_ann.cpp
+       nearest_neighbor_graph.cpp nearest_neighbor_graph_ann.cpp
 
 EXTRA_DIST = minglelib.vcxproj*
- 

diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index 64140dc2d27e8ebe92035776a3b9ede5c5e26793..e7ddc60fa5215e54941a5380413d8d02d25d2f37 100644 (file)
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/Makefile.am
@@ -2,12 +2,12 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/gvc \
-        -I$(top_srcdir)/lib/pack \
-        -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/lib/cgraph \
-        -I$(top_srcdir)/lib/cdt $(IPSEPCOLA_INCLUDES) $(GTS_CFLAGS)
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/pack \
+       -I$(top_srcdir)/lib/pathplan \
+       -I$(top_srcdir)/lib/cgraph \
+       -I$(top_srcdir)/lib/cdt $(IPSEPCOLA_INCLUDES) $(GTS_CFLAGS)
 
 if WITH_WIN32
 AM_CFLAGS = -DNEATOGEN_EXPORTS=1
@@ -19,12 +19,12 @@ noinst_HEADERS = adjust.h edges.h geometry.h heap.h hedges.h info.h mem.h \
        neato.h poly.h neatoprocs.h site.h voronoi.h \
        bfs.h closest.h conjgrad.h defs.h dijkstra.h embed_graph.h kkutils.h \
        matrix_ops.h pca.h stress.h quad_prog_solver.h digcola.h \
-    overlap.h call_tri.h \
+       overlap.h call_tri.h \
        quad_prog_vpsc.h delaunay.h sparsegraph.h multispline.h fPQ.h \
        sgd.h randomkit.h
 
 IPSEPCOLA_SOURCES = constrained_majorization_ipsep.c \
-       mosek_quad_solve.c mosek_quad_solve.h quad_prog_vpsc.c 
+       mosek_quad_solve.c mosek_quad_solve.h quad_prog_vpsc.c
 
 if WITH_IPSEPCOLA
 WITH_IPSEPCOLA_SOURCES = $(IPSEPCOLA_SOURCES)
@@ -36,7 +36,7 @@ libneatogen_C_la_SOURCES = adjust.c circuit.c edges.c geometry.c \
        voronoi.c stress.c kkutils.c matrix_ops.c embed_graph.c dijkstra.c \
        conjgrad.c pca.c closest.c bfs.c constraint.c quad_prog_solve.c \
        smart_ini_x.c constrained_majorization.c opt_arrangement.c \
-    overlap.c call_tri.c \
+       overlap.c call_tri.c \
        compute_hierarchy.c delaunay.c multispline.c $(WITH_IPSEPCOLA_SOURCES) \
        sgd.c randomkit.c
 

diff --git a/lib/ortho/Makefile.am b/lib/ortho/Makefile.am
index 0608c3662e0ce6b1067fe1187bfdbc2432074dc0..87863e05d758f9fbaba2399a92f8d934bd0161ed 100644 (file)
--- a/lib/ortho/Makefile.am
+++ b/lib/ortho/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \
@@ -22,4 +22,3 @@ endif
 libortho_C_la_SOURCES = fPQ.c maze.c ortho.c partition.c rawgraph.c sgraph.c trapezoid.c
 
 EXTRA_DIST = gvortho.vcxproj*
- 

diff --git a/lib/osage/Makefile.am b/lib/osage/Makefile.am
index c7ce05eb7a78b98c787a1a403c8d84a202cacf8f..cb108393702bab5863427e2b3440a6b490567690 100644 (file)
--- a/lib/osage/Makefile.am
+++ b/lib/osage/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \
@@ -18,5 +18,3 @@ noinst_LTLIBRARIES = libosage_C.la
 
 libosage_C_la_SOURCES = osageinit.c
 EXTRA_DIST = osage.vcxproj*
-
-

diff --git a/lib/pack/Makefile.am b/lib/pack/Makefile.am
index bddf76fd92c937ba9471b4cc6a783877739940ea..144ac070f1e7eedb77f97f0d437549bee197b451 100644 (file)
--- a/lib/pack/Makefile.am
+++ b/lib/pack/Makefile.am
@@ -5,7 +5,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/cgraph \
@@ -45,4 +45,3 @@ endif
 EXTRA_DIST = $(man_MANS) $(pdf)
 
 DISTCLEANFILES = $(pdf) pack.3.ps
-

diff --git a/lib/patchwork/Makefile.am b/lib/patchwork/Makefile.am
index bc9a7b2e4683d9cc5a96529fb163c43660b389e4..d75dab7dfe0476018d15928b82d742cb00d86514 100644 (file)
--- a/lib/patchwork/Makefile.am
+++ b/lib/patchwork/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \

diff --git a/lib/pathplan/Makefile.am b/lib/pathplan/Makefile.am
index 16a2667e4ee88086ef8bb5962838af443b110efa..cf01b66aae0782091403055798df4e4ab5f6b528 100644 (file)
--- a/lib/pathplan/Makefile.am
+++ b/lib/pathplan/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-PATHPLAN_VERSION="4:0:0"
+PATHPLAN_VERSION = "4:0:0"
 
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/lib/rbtree/Makefile.am b/lib/rbtree/Makefile.am
index d8e0fecb1eb73b170979e5983729cfcc9c2d3b67..7d15e4b9d95131873c09ec65f4d430aaada09458 100644 (file)
--- a/lib/rbtree/Makefile.am
+++ b/lib/rbtree/Makefile.am
@@ -8,4 +8,4 @@ noinst_LTLIBRARIES = librbtree_C.la
 librbtree_C_la_SOURCES = misc.c red_black_tree.c stack.c
 
 EXTRA_DIST = LICENSE CHANGES makefile.txt test_red_black_tree.c \
-            rbtree.vcxproj*
+       rbtree.vcxproj*

diff --git a/lib/sfdpgen/Makefile.am b/lib/sfdpgen/Makefile.am
index e98f5856cc431ecba146d385dfdd4c178eeea538..5bfaa72bc55cfb342f233a94d160f8f6e25b6195 100644 (file)
--- a/lib/sfdpgen/Makefile.am
+++ b/lib/sfdpgen/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \
@@ -16,7 +16,7 @@ endif
 noinst_HEADERS = sfdpinternal.h spring_electrical.h \
        sparse_solve.h post_process.h \
        stress_model.h uniform_stress.h \
-       Multilevel.h sfdp.h PriorityQueue.h 
+       Multilevel.h sfdp.h PriorityQueue.h
 
 if WITH_SFDP
 noinst_LTLIBRARIES = libsfdpgen_C.la

diff --git a/lib/sparse/Makefile.am b/lib/sparse/Makefile.am
index 752b5d058104602bd6993979eb405af889c7ebac..2c3d2a18e234d8778a5989f737285f875a72f3a5 100644 (file)
--- a/lib/sparse/Makefile.am
+++ b/lib/sparse/Makefile.am
@@ -4,14 +4,14 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
-       -I$(top_srcdir)/lib/cdt 
+       -I$(top_srcdir)/lib/cdt
 
 noinst_HEADERS = SparseMatrix.h general.h BinaryHeap.h IntStack.h DotIO.h \
-    LinkedList.h colorutil.h color_palette.h mq.h clustering.h QuadTree.h 
+       LinkedList.h colorutil.h color_palette.h mq.h clustering.h QuadTree.h
 
 noinst_LTLIBRARIES = libsparse_C.la
 
 libsparse_C_la_SOURCES = SparseMatrix.c general.c BinaryHeap.c IntStack.c DotIO.c \
-    LinkedList.c colorutil.c color_palette.c mq.c clustering.c QuadTree.c
+       LinkedList.c colorutil.c color_palette.c mq.c clustering.c QuadTree.c
 
 EXTRA_DIST = gvsparse.vcxproj*

diff --git a/lib/twopigen/Makefile.am b/lib/twopigen/Makefile.am
index 06123edf881002ded055e98e1fb8b5ec8b1cbdac..eb916bdc08f1fdf42d9b74fd125de5e849d8d6a7 100644 (file)
--- a/lib/twopigen/Makefile.am
+++ b/lib/twopigen/Makefile.am
@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pack \
        -I$(top_srcdir)/lib/pathplan \

diff --git a/lib/xdot/Makefile.am b/lib/xdot/Makefile.am
index 117b969e9472a0fd8daab985f00854dc57e73f85..626ec1dd470ace6dd07bf21ee1842bfe1a0d3c80 100644 (file)
--- a/lib/xdot/Makefile.am
+++ b/lib/xdot/Makefile.am
@@ -2,7 +2,7 @@
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-XDOT_VERSION="4:0:0"
+XDOT_VERSION = "4:0:0"
 
 pdfdir = $(pkgdatadir)/doc/pdf
 pkginclude_HEADERS = xdot.h
@@ -43,4 +43,3 @@ endif
 EXTRA_DIST = $(man_MANS) $(pdf) xdot.vcxproj*
 
 DISTCLEANFILES = $(pdf) xdot.3.ps
-

diff --git a/plugin.demo/xgtk/Makefile.am b/plugin.demo/xgtk/Makefile.am
index d8009eaa8c5bf919424a12c3918ecd5864b22cc1..1af293fce236cf06d678f882f1ef4169cdf5ca08 100644 (file)
--- a/plugin.demo/xgtk/Makefile.am
+++ b/plugin.demo/xgtk/Makefile.am
@@ -1,10 +1,9 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS=src
+SUBDIRS = src
 
 .PHONY: rpm
 rpm: dist
        rpmbuild -ta xgtk-plugin-$(VERSION).tar.gz
 
 EXTRA_DIST = xgtk-plugin.spec
-

diff --git a/plugin.demo/xgtk/src/Makefile.am b/plugin.demo/xgtk/src/Makefile.am
index d69f6a785a55433063cee1093f1d3e2594cdb571..430576e01d37431854bb54245ff38e17df1a8b63 100644 (file)
--- a/plugin.demo/xgtk/src/Makefile.am
+++ b/plugin.demo/xgtk/src/Makefile.am
@@ -15,14 +15,14 @@ libgvplugin_xgtk_C_la_SOURCES = \
        gvplugin_xgtk.c \
        gvdevice_xgtk.c \
        support.c \
-        interface.c \
-        callbacks.c 
+       interface.c \
+       callbacks.c
 
 libgvplugin_xgtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_xgtk_la_SOURCES = $(libgvplugin_xgtk_C_la_SOURCES)
 libgvplugin_xgtk_la_LIBADD = $(GTK_LIBS)
 
-EXTRA_DIST = gtk.glade gtk.gladep 
+EXTRA_DIST = gtk.glade gtk.gladep
 
 # run "dot -c", if possible, to create plugin config
 install-exec-hook:

diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 0520abae7a865d1897c096cd816b0d570232fa56..094cbd6a8a29a1469e4ef73ab3d63b788c9f445b 100644 (file)
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -36,9 +36,9 @@ libgvplugin_core_C_la_SOURCES = \
 libgvplugin_core_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
 libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \
-                               $(top_builddir)/lib/cgraph/libcgraph.la \
-                               $(top_builddir)/lib/cdt/libcdt.la \
-                               $(top_builddir)/lib/xdot/libxdot.la
+       $(top_builddir)/lib/cgraph/libcgraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la \
+       $(top_builddir)/lib/xdot/libxdot.la
 
 if WITH_WIN32
 libgvplugin_core_la_LDFLAGS += -no-undefined

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index 5727d63cf83eab61e98cef22f199ce33076b8b2a..300995eddbd3f42cd24a804475cf6509d179b295 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -36,7 +36,7 @@ libgvplugin_gd_la_LIBADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/cdt/libcdt.la $(PANGOCAIRO_LIBS) $(GDLIB_LIBS) $(MATH_LIBS)
-libgvplugin_gd_la_DEPENDENCIES =  $(top_builddir)/lib/gvc/libgvc.la
+libgvplugin_gd_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la
 
 if WITH_WIN32
 libgvplugin_gd_la_LDFLAGS += -no-undefined

diff --git a/plugin/gdk/Makefile.am b/plugin/gdk/Makefile.am
index 9e28df2535f3e266c0a4d20dd6597728e6400fb3..0eabb7132836ab2148eea521c95727acc23ce75b 100644 (file)
--- a/plugin/gdk/Makefile.am
+++ b/plugin/gdk/Makefile.am
@@ -31,7 +31,7 @@ libgvplugin_gdk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_gdk_la_SOURCES = $(libgvplugin_gdk_C_la_SOURCES)
 libgvplugin_gdk_la_LIBADD = \
        $(top_builddir)/lib/gvc/libgvc.la $(GDK_PIXBUF_LIBS) $(PANGOCAIRO_LIBS) $(GDK_LIBS)
-       
+
 if WITH_WIN32
 libgvplugin_gdk_la_LDFLAGS += -no-undefined
 endif

diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index f6bc0e6c4abc5b7639b60dada5ece4016bee75f2..1d1651199879a8b89468f2e6eb0bb297949e8801 100644 (file)
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/Makefile.am
@@ -1,13 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir)/lib \
-        -I$(top_srcdir)/lib/common \
-        -I$(top_srcdir)/lib/pathplan \
-        -I$(top_srcdir)/lib/gvc \
-        -I$(top_srcdir)/lib/cgraph \
-        -I$(top_srcdir)/lib/cdt \
-        $(GTK_CFLAGS:-I%=-isystem%)
+       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/pathplan \
+       -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/cgraph \
+       -I$(top_srcdir)/lib/cdt \
+       $(GTK_CFLAGS:-I%=-isystem%)
 
 if WITH_PANGOCAIRO
 if WITH_GTK
@@ -25,8 +25,8 @@ libgvplugin_gtk_C_la_SOURCES = \
        gvplugin_gtk.c \
        gvdevice_gtk.c \
        support.c \
-        interface.c \
-        callbacks.c 
+       interface.c \
+       callbacks.c
 
 libgvplugin_gtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
@@ -40,4 +40,4 @@ if WITH_DARWIN9
 libgvplugin_gtk_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_gtk_LTX_library
 endif
 
-EXTRA_DIST = gtk.glade gtk.gladep 
+EXTRA_DIST = gtk.glade gtk.gladep

diff --git a/plugin/visio/Makefile.am b/plugin/visio/Makefile.am
index 7a2186708d11ea47d92cc47994164b5a962b8636..dde9ad643c44be86d3d94e0d09b82d911b47a2c9 100644 (file)
--- a/plugin/visio/Makefile.am
+++ b/plugin/visio/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt \
-       $(VISIO_CFLAGS) 
+       $(VISIO_CFLAGS)
 
 noinst_HEADERS = VisioGraphic.h VisioRender.h VisioText.h
 
@@ -31,7 +31,7 @@ libgvplugin_visio_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_visio_la_SOURCES = $(libgvplugin_visio_C_la_SOURCES)
 libgvplugin_visio_la_LIBADD = \
        $(top_builddir)/lib/cgraph/libcgraph.la \
-       $(top_builddir)/lib/gvc/libgvc.la $(VISIO_LIBS) 
+       $(top_builddir)/lib/gvc/libgvc.la $(VISIO_LIBS)
 
 if WITH_WIN32
 libgvplugin_visio_la_LDFLAGS += -no-undefined
@@ -41,6 +41,6 @@ if WITH_DARWIN9
 libgvplugin_visio_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_visio_LTX_library
 endif
 
-EXTRA_DIST = 
+EXTRA_DIST =
 
-DISTCLEANFILES = 
+DISTCLEANFILES =

diff --git a/share/Makefile.am b/share/Makefile.am
index 78af31294a7356efaa5f4ed4c46645ff9bc61470..3c8573d2ee44c3b677c48b2c63eee6f72a529e20 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1 +1 @@
-SUBDIRS = examples  gui
+SUBDIRS = examples gui

diff --git a/share/gui/Makefile.am b/share/gui/Makefile.am
index 32f4d1ebfeccefb8657e1ec1e3cc3728e8575517..ab785898b0904f45583cfce96928db236cc88cd2 100644 (file)
--- a/share/gui/Makefile.am
+++ b/share/gui/Makefile.am
@@ -10,10 +10,10 @@ icons = cursor.png \
        pan.png selectx.png zoom_in.png \
        zoom_out.png zoom.png \
        fisheye.raw pan.raw zoom.raw \
-    selectr.png single_select.png 2D.png 3D.png center.png \
-    details.png fisheye.png mod_3D.png \
-    mod_fisheye.png no_fisheye.png \
-    zoomin.png zoomout.png
+       selectr.png single_select.png 2D.png 3D.png center.png \
+       details.png fisheye.png mod_3D.png \
+       mod_fisheye.png no_fisheye.png \
+       zoomin.png zoomout.png
 
 if WITH_SMYRNA
 gui_DATA = $(gui)

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 88e5bcf6d3b757d119a211fc1537634993030d4d..d7fd82966850986c24615d3474060f8464a0cf89 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -6,7 +6,7 @@ pdfdir = $(pkgdatadir)/doc/pdf
 pkgtcldir = $(pkglibdir)/tcl
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir) \
+       -I$(top_srcdir) \
        $(GDLIB_CFLAGS) $(TCL_INCLUDES)
 
 LIBS = @LIBS@ -lc
@@ -69,5 +69,4 @@ endif
 EXTRA_DIST = $(man) $(pdf)
 
 CLEANFILES = pkgIndex.tcl
-
 DISTCLEANFILES = $(pdf) gdtclft.3tcl.ps

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 2cd03a071fabfd046275d3514b4f4daac6f66194..1b9fa4506e2d757e3ec318387939d15e1f8242fd 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -24,7 +24,7 @@ pkgsharpdir = $(pkglibdir)/sharp
 SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs
 nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_data)
 libgv_sharp_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
-libgv_sharp_la_LIBADD = $(BASELIBS) $(SHARP_LIBS) 
+libgv_sharp_la_LIBADD = $(BASELIBS) $(SHARP_LIBS)
 libgv_sharp_la_LDFLAGS = -module -avoid-version
 libgv_sharp_la_CPPFLAGS = $(BASECPPFLAGS) $(SHARP_INCLUDES)
 $(SHARP_data): gv_sharp.cpp
@@ -32,7 +32,7 @@ gv_sharp.cpp: gv.i
        $(SWIG) -c++ -csharp -namespace gv -o $@ $(srcdir)/gv.i
 
 pkgddir = $(pkglibdir)/d
-D_data = 
+D_data =
 nodist_libgv_d_la_SOURCES = gv_d.cpp $(D_data)
 libgv_d_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_d_la_LIBADD = $(BASELIBS) $(D_LIBS)
@@ -57,7 +57,7 @@ runtime.h:
        $(SWIG) -c++ -go -intgosize $(INTGOSIZE) -external-runtime $@
 gv.go:
        echo "package gv" >$@
-       
+
 
 gvgotest: gv.i gvgotest.go gv.go runtime.h
        ( \
@@ -75,7 +75,7 @@ gvgotest: gv.i gvgotest.go gv.go runtime.h
        )
 
 pkgguiledir = $(pkglibdir)/guile
-GUILE_data = 
+GUILE_data =
 nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_data)
 libgv_guile_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_guile_la_LIBADD = $(BASELIBS) $(GUILE_LIBS)
@@ -87,7 +87,7 @@ gv_guile.cpp: gv.i
        $(SWIG) -c++ -guile -o $@ $(srcdir)/gv.i
 
 pkgiodir = $(pkglibdir)/io
-IO_data = 
+IO_data =
 nodist_libgv_io_la_SOURCES = gv_io.cpp $(IO_data)
 libgv_io_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_io_la_LIBADD = $(BASELIBS) $(IO_LIBS)
@@ -101,7 +101,7 @@ libjavadir = $(pkglibdir)/java
 pkgjavadir = $(libjavadir)/org/graphviz
 JAVA_data = gv.java gvJNI.java SWIGTYPE_p_Agraph_t.java SWIGTYPE_p_Agnode_t.java SWIGTYPE_p_Agedge_t.java SWIGTYPE_p_Agsym_t.java SWIGTYPE_p_FILE.java
 nodist_libgv_java_la_SOURCES = gv_java.cpp
-libgv_java_la_SOURCES = $(BASESOURCES)  gv_java_init.c
+libgv_java_la_SOURCES = $(BASESOURCES) gv_java_init.c
 libgv_java_la_LIBADD = $(BASELIBS) $(JAVA_LIBS)
 libgv_java_la_LDFLAGS = -module -avoid-version $(JNI_EXTRA_LDFLAGS)
 libgv_java_la_CPPFLAGS = $(BASECPPFLAGS) $(SWIGJAVA_CPPFLAGS) $(JAVA_INCLUDES)
@@ -110,7 +110,7 @@ gv_java.cpp: gv.i
        $(SWIG) -package org.graphviz -java -c++ -o $@ $(srcdir)/gv.i
 
 pkgjavascriptdir = $(pkglibdir)/javascript
-JAVASCRIPT_data = 
+JAVASCRIPT_data =
 nodist_libgv_javascript_la_SOURCES = gv_javascript.cpp $(JAVASCRIPT_data)
 libgv_javascript_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_javascript_la_LIBADD = $(BASELIBS) $(JAVASCRIPT_LIBS)
@@ -120,7 +120,7 @@ gv_javascript.cpp: gv.i
        $(SWIG) -c++ -javascript -jsc -o $@ $(srcdir)/gv.i
 
 pkgluadir = $(pkglibdir)/lua
-LUA_data = 
+LUA_data =
 nodist_libgv_lua_la_SOURCES = gv_lua.cpp $(LUA_data)
 libgv_lua_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_lua_la_LIBADD = $(BASELIBS) $(LUA_LIBS)
@@ -173,10 +173,10 @@ gv.cmxa: gv.cmx
 gv.a:  gv.cmxa
 
 pkgperldir = $(pkglibdir)/perl
-PERL        ?= perl
-PERL_CC      = `$(PERL) -MExtUtils::Embed -e ccopts`
-PERL_LD      = `$(PERL) -MExtUtils::Embed -e ldopts`
-VENDOR_ARCH  = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'`
+PERL ?= perl
+PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts`
+PERL_LD = `$(PERL) -MExtUtils::Embed -e ldopts`
+VENDOR_ARCH = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'`
 PERL_data = gv.pm
 nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
 libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
@@ -223,7 +223,7 @@ gv_python3.cpp: gv.i
        $(SWIG) -c++ -python -o $@ $(srcdir)/gv.i
 
 pkgRdir = $(pkglibdir)/R
-R_data = 
+R_data =
 nodist_libgv_R_la_SOURCES = gv_R.cpp $(R_data)
 libgv_R_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_R_la_LIBADD = $(BASELIBS) $(R_LIBS)
@@ -234,7 +234,7 @@ gv_R.cpp: gv.i
        $(SWIG) -c++ -r -o $@ $(srcdir)/gv.i
 
 pkgrubydir = $(pkglibdir)/ruby
-RUBY_data = 
+RUBY_data =
 nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_data)
 libgv_ruby_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_ruby_la_LIBADD = $(BASELIBS) $(RUBY_LIBS)
@@ -246,7 +246,7 @@ gv_ruby.cpp: gv.i
        $(SWIG) -c++ -ruby -o $@ $(srcdir)/gv.i
 
 pkgtcldir = $(pkglibdir)/tcl
-TCL_data = 
+TCL_data =
 nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_data)
 libgv_tcl_la_SOURCES = $(BASESOURCES) gv_tcl_init.c
 libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) $(TCL_LIBS)
@@ -257,9 +257,9 @@ gv_tcl.cpp: gv.i
        $(SWIG) -c++ -tcl -namespace -o $@ $(srcdir)/gv.i
 
 pkginclude_HEADERS = gv.i gv.cpp
-pkglib_LTLIBRARIES = 
+pkglib_LTLIBRARIES =
 man_MANS =
-pdf_DATA = 
+pdf_DATA =
 DEVTSTS =
 if WITH_SWIG
 if WITH_SHARP
@@ -409,7 +409,7 @@ man = gv.3sharp gv.3go gv.3guile gv.3io gv.3java gv.3lua gv.3ocaml \
 if ENABLE_MAN_PDFS
 if HAVE_PS2PDF
 pdf = gv.3sharp.pdf gv.3go.pdf gv.3guile.pdf gv.3io.pdf gv.3java.pdf gv.3lua.pdf \
-      gv.3ocaml.pdf gv.3perl.pdf gv.3php.pdf gv.3python.pdf gv.3r.pdf gv.3ruby.pdf gv.3tcl.pdf
+       gv.3ocaml.pdf gv.3perl.pdf gv.3php.pdf gv.3python.pdf gv.3r.pdf gv.3ruby.pdf gv.3tcl.pdf
 else
 pdf = ERROR_NO_PS2PDF
 endif
@@ -511,13 +511,13 @@ if WITH_JAVA
        (cd $(DESTDIR)$(pkgjavadir); $(LN_S) -f org/graphviz/libgv_java.$(JSHEXT) ../../libgv.$(JSHEXT); javac -classpath $(DESTDIR)$(libjavadir) gv.java;)
 endif
 if WITH_LUA
-       (cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
+       (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so gv.so;)
 endif
 if WITH_PERL
-       (cd $(DESTDIR)$(pkgperldir);   rm -f gv.so;  $(LN_S) libgv_perl.so gv.so;)
+       (cd $(DESTDIR)$(pkgperldir); rm -f gv.so; $(LN_S) libgv_perl.so gv.so;)
 endif
 if WITH_PHP
-       (cd $(DESTDIR)$(pkgphpdir);   rm -f gv.so;  $(LN_S) libgv_php.so gv.so;)
+       (cd $(DESTDIR)$(pkgphpdir); rm -f gv.so; $(LN_S) libgv_php.so gv.so;)
 endif
 if WITH_PYTHON
        (cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
@@ -526,10 +526,10 @@ if WITH_PYTHON3
        (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python3.so _gv.so;)
 endif
 if WITH_R
-       (cd $(DESTDIR)$(pkgRdir);   rm -f gv.so;  $(LN_S) libgv_R.so gv.so;)
+       (cd $(DESTDIR)$(pkgRdir); rm -f gv.so; $(LN_S) libgv_R.so gv.so;)
 endif
 if WITH_RUBY
-       (cd $(DESTDIR)$(pkgrubydir);   rm -f gv.so;  $(LN_S) libgv_ruby.so gv.so;)
+       (cd $(DESTDIR)$(pkgrubydir); rm -f gv.so; $(LN_S) libgv_ruby.so gv.so;)
 endif
 
 devtsts: $(DEVTSTS)
@@ -571,7 +571,7 @@ test_java: libgv_java.la
                ln -f ../.libs/libgv_java.so libgv.jnilib; \
                ln -f ../$(srcdir)/*.java org/graphviz; \
                ln -f ../$(srcdir)/test.java .; \
-               ln -f ../$(srcdir)/hello.gv  .; \
+               ln -f ../$(srcdir)/hello.gv .; \
                ln -f ../$(srcdir)/test.java .; \
                CLASSPATH=. javac *.java; \
                LD_LIBRARY_PATH=. CLASSPATH=. java test)
@@ -658,7 +658,6 @@ CLEANFILES = test_*/* pkgIndex.tcl \
        gv_R.cpp $(R_data) \
        gv_ruby.cpp $(RUBY_data) \
        gv_tcl.cpp $(TCL_data) pkgIndex.tcl
-
 DISTCLEANFILES = gv_*.n gv_*.pdf gv.3sharp.ps gv.3go.ps gv.3guile.ps \
        gv.3io.ps gv.3java.ps gv.3lua.ps gv.3ocaml.ps gv.3perl.ps gv.3php.ps \
        gv.3python.ps gv.3r.ps gv.3ruby.ps gv.3tcl.ps

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 9149e2aa76e609de0d59a4f0f630b0334a387105..9de76841f4f5afa29ab14cb6a93c28ca23d53957 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -3,8 +3,8 @@
 SUBDIRS = demo
 
 # tclhandle still needed for gd
-TCLHANDLE_INCLUDES=-I$(top_srcdir)/tclpkg/tclhandle
-TCLHANDLE_LIBS=$(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la
+TCLHANDLE_INCLUDES = -I$(top_srcdir)/tclpkg/tclhandle
+TCLHANDLE_LIBS = $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la
 if WITH_LIBGD
 GDTCLFT_LIBS = $(top_builddir)/tclpkg/gdtclft/libgdtclft_C.la
 endif
@@ -59,16 +59,16 @@ libtcldot_la_SOURCES = \
        tcldot-io.c \
        no_builtins.c $(GDTCLFT)
 libtcldot_la_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
-libtcldot_la_LDFLAGS = -no-undefined 
+libtcldot_la_LDFLAGS = -no-undefined
 
 libtcldot_la_LIBADD = $(TCLHANDLE_LIBS) $(GDTCLFT_LIBS) \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la  \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
-       $(top_builddir)/lib/gvc/libgvc.la 
+       $(top_builddir)/lib/gvc/libgvc.la
 
-libtcldot_la_DEPENDENCIES =  $(top_builddir)/lib/gvc/libgvc.la
+libtcldot_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la
 
 # GDTCLFT requires gd libs to be builtin
 if WITH_LIBGD
@@ -134,5 +134,4 @@ endif
 EXTRA_DIST = $(man) $(pdf) $(html) README README.Tkspline
 
 CLEANFILES = pkgIndex.tcl
-
 DISTCLEANFILES = $(pdf) tcldot.3tcl.ps

diff --git a/tclpkg/tkspline/Makefile.am b/tclpkg/tkspline/Makefile.am
index 7052c09f3c0650d21f7cef2d52a8c9e12fddf778..35b9b36c3826cb67a19b8c56b9d2107a1f7d3795 100644 (file)
--- a/tclpkg/tkspline/Makefile.am
+++ b/tclpkg/tkspline/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
        $(TCL_INCLUDES) $(TCLINT_INCLUDES) \
        $(TK_INCLUDES) $(TKINT_INCLUDES) -I$(top_srcdir)/tclpkg/tkstubs
 
-AM_CFLAGS = $(X_CFLAGS) $(TCL_CFLAGS)  $(TK_CFLAGS) $(TK_DEFS) \
+AM_CFLAGS = $(X_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(TK_DEFS) \
        -UPACKAGE_NAME -UPACKAGE_STRING -UPACKAGE_TARNAME \
        -UPACKAGE_VERSION -UPACKAGE_BUGREPORT
 
@@ -35,7 +35,7 @@ pdf_DATA = tkspline.3tk.pdf
 endif
 endif
 
-libtkspline_la_LDFLAGS = -no-undefined 
+libtkspline_la_LDFLAGS = -no-undefined
 libtkspline_la_SOURCES = tkspline.c
 libtkspline_la_LIBADD = \
        $(top_builddir)/tclpkg/tkstubs/libtkstubs_C.la \
@@ -61,5 +61,4 @@ endif
 EXTRA_DIST = $(man) $(pdf) dllEntry.c
 
 CLEANFILES = pkgIndex.tcl
-
 DISTCLEANFILES = $(pdf) tkspline.3tk.ps

diff --git a/tclpkg/tkstubs/Makefile.am b/tclpkg/tkstubs/Makefile.am
index 2dfaefe22a9a1370535b0b5d8aa5f4d45be7034d..d5dd3b7852af12af93f89645da990c980b047c3e 100644 (file)
--- a/tclpkg/tkstubs/Makefile.am
+++ b/tclpkg/tkstubs/Makefile.am
@@ -1,7 +1,7 @@
 # Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) $(TCL_INCLUDES)  $(TK_INCLUDES) $(TK_XINCLUDES)
-                                                                                
+AM_CPPFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES) $(TK_XINCLUDES)
+
 LIBS = $(TK_STUB_LIB_SPEC)
 
 if WITH_TK

diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am
index de74d1d98ce077d56784ffcd2e2c2c6fb76ccf62..10b2294c1e90fa06d42656a1d5d4455d93edfd07 100644 (file)
--- a/tests/unit_tests/Makefile.am
+++ b/tests/unit_tests/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = lib 
+SUBDIRS = lib

diff --git a/tests/unit_tests/lib/Makefile.am b/tests/unit_tests/lib/Makefile.am
index 16d1287c66610da87c7922d1fa35ac60201f18a9..72f5a87e1507a0b0da8782ceb8c35d98a428df49 100644 (file)
--- a/tests/unit_tests/lib/Makefile.am
+++ b/tests/unit_tests/lib/Makefile.am
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = common 
+SUBDIRS = common

diff --git a/tests/unit_tests/lib/common/Makefile.am b/tests/unit_tests/lib/common/Makefile.am
index 336092c514e3c1b7c166af1e059173c36920e310..e9101350f2efb447f08717473dafdf2f9d7c6511 100644 (file)
--- a/tests/unit_tests/lib/common/Makefile.am
+++ b/tests/unit_tests/lib/common/Makefile.am
@@ -4,12 +4,12 @@ if HAVE_CRITERION
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
-    -I$(top_srcdir)/lib/common \
-    -I$(top_srcdir)/lib/gvc \
+       -I$(top_srcdir)/lib/common \
+       -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt \
-    -DDEMAND_LOADING=1
+       -DDEMAND_LOADING=1
 
 AM_LDFLAGS = \
        -lcriterion