[dia] build: fix most 'INCLUDES' is the old name for 'AM_CPPFLAGS'

From: Hans Breuer <hans src gnome org>
To: commits-list gnome org
Cc:
Subject: [dia] build: fix most 'INCLUDES' is the old name for 'AM_CPPFLAGS'
Date: Sun, 6 Apr 2014 13:35:01 +0000 (UTC)
commit 4830cdb9aa59f6f70f64f852bf1db4a5c9d1dca2
Author: Hans Breuer <hans breuer org>
Date:   Sun Feb 23 21:56:59 2014 +0100

    build: fix most 'INCLUDES' is the old name for 'AM_CPPFLAGS'
    
    not for bindings/Makefile.am, missing CXXFLAGS?

 app/Makefile.am                  |    4 +-
 configure.in => configure.ac     |    2 +-
 doc/en/dia.1                     |  371 +++++++++++---------------------------
 doc/eu/dia.1                     |  371 +++++++++++---------------------------
 lib/Makefile.am                  |    2 +-
 objects/AADL/Makefile.am         |    2 +-
 objects/Database/Makefile.am     |    2 +-
 objects/ER/Makefile.am           |    2 +-
 objects/FS/Makefile.am           |    2 +-
 objects/GRAFCET/Makefile.am      |    2 +-
 objects/Istar/Makefile.am        |    2 +-
 objects/Jackson/Makefile.am      |    2 +-
 objects/KAOS/Makefile.am         |    2 +-
 objects/Misc/Makefile.am         |    2 +-
 objects/SADT/Makefile.am         |    2 +-
 objects/UML/Makefile.am          |    2 +-
 objects/chronogram/Makefile.am   |    2 +-
 objects/custom/Makefile.am       |    2 +-
 objects/custom_lines/Makefile.am |    2 +-
 objects/flowchart/Makefile.am    |    2 +-
 objects/network/Makefile.am      |    2 +-
 objects/standard/Makefile.am     |    2 +-
 plug-ins/cairo/Makefile.am       |    2 +-
 plug-ins/cgm/Makefile.am         |    2 +-
 plug-ins/drs/Makefile.am         |    2 +-
 plug-ins/dxf/Makefile.am         |    2 +-
 plug-ins/hpgl/Makefile.am        |    2 +-
 plug-ins/layout/Makefile.am      |    2 +-
 plug-ins/libart/Makefile.am      |    2 +-
 plug-ins/metapost/Makefile.am    |    2 +-
 plug-ins/pdf/Makefile.am         |    2 +-
 plug-ins/pgf/Makefile.am         |    2 +-
 plug-ins/pixbuf/Makefile.am      |    2 +-
 plug-ins/postscript/Makefile.am  |    2 +-
 plug-ins/pstricks/Makefile.am    |    2 +-
 plug-ins/python/Makefile.am      |    2 +-
 plug-ins/shape/Makefile.am       |    2 +-
 plug-ins/stress/Makefile.am      |    2 +-
 plug-ins/svg/Makefile.am         |    2 +-
 plug-ins/vdx/Makefile.am         |    2 +-
 plug-ins/wmf/Makefile.am         |    2 +-
 plug-ins/wpg/Makefile.am         |    2 +-
 plug-ins/xfig/Makefile.am        |    2 +-
 plug-ins/xslt/Makefile.am        |    2 +-
 tests/Makefile.am                |    2 +-
 45 files changed, 248 insertions(+), 582 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index 252bdd2..52f0b7e 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -2,13 +2,13 @@
 
 SUBDIRS = pixmaps
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/lib \
        $(DEBUG_FLAGS) \
        $(GTK_CFLAGS) \
-       $(GTK_MAC_CFLAGS) \ 
+       $(GTK_MAC_CFLAGS) \
        $(LIBART_CFLAGS) \
        -DPREFIX=\""$(prefix)"\" \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/configure.in b/configure.ac
similarity index 99%
rename from configure.in
rename to configure.ac
index d81a8b7..4c0bbea 100644
--- a/configure.in
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_PREREQ(2.50)
 AC_REVISION($Revision: 1.288 $)
 
 dnl Specify a header configuration file
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
 
diff --git a/doc/en/dia.1 b/doc/en/dia.1
index a902a7f..fd4a8fb 100644
--- a/doc/en/dia.1
+++ b/doc/en/dia.1
@@ -1,156 +1,109 @@
-'\" t
 .\"     Title: dia
 .\"    Author: Fredrik Hallenberg <hallon lysator liu se>
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 2004-11-26
-.\"    Manual: [FIXME: manual]
-.\"    Source: [FIXME: source]
-.\"  Language: English
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 2004.11.26
+.\"    Manual: 
+.\"    Source: 
 .\"
-.TH "DIA" "1" "2004\-11\-26" "[FIXME: source]" "[FIXME: manual]"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
+.TH "DIA" "1" "2004\-11\-26" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
 .SH "NAME"
 dia \- a diagram drawing program
 .SH "SYNOPSIS"
-.HP \w'\fBdia\fR\ 'u
-\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] 
[\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-L\ \fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR] 
[\fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] 
[\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ 
\fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \&.\&.\&.]
+.HP 4
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] 
[\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-L\ \fR\fB\fILAYER,LAYER,...\fR\fR] 
[\fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,...\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] 
[\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ 
\fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ ...]
 .SH "DESCRIPTION"
 .PP
 \fBDia\fR
-is used to create diagrams\&. Dia has a number of basic tools, like lines and boxes but can also dynamically 
load
-\fIsheets\fR\&. A sheet is a collection of tools that are used in a certain type of diagram\&.
+is used to create diagrams. Dia has a number of basic tools, like lines and boxes but can also dynamically 
load
+\fIsheets\fR. A sheet is a collection of tools that are used in a certain type of diagram.
 .PP
 Most diagram objects in
 \fBDia\fR
 have
-\fIconnection points\fR\&. Lines can be connected to these connection points and this way graph structures 
can be formed\&. When objects are moved or resized the connections will follow the objects\&.
+\fIconnection points\fR. Lines can be connected to these connection points and this way graph structures can 
be formed. When objects are moved or resized the connections will follow the objects.
 .PP
 Diagrams drawn in
 \fBDia\fR
-can be exported as PostScript\&.
+can be exported as PostScript.
 .SH "OPTIONS"
 .PP
 \fBDia\fR
 accepts the following options:
 .PP
 \fB\-c\fR \fB\-\-credits\fR
-.RS 4
-Display credits list and exit\&.
+.RS 3n
+Display credits list and exit.
 .RE
 .PP
 \fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
-.RS 4
-Export loaded file to OUTPUT and exit\&.
+.RS 3n
+Export loaded file to OUTPUT and exit.
 .RE
 .PP
 \fB\-h\fR \fB\-\-help\fR
-.RS 4
-Display a list of all commandline options\&.
+.RS 3n
+Display a list of all commandline options.
 .RE
 .PP
 \fB\-n\fR \fB\-\-nosplash\fR
-.RS 4
-Do not show the splash screen\&.
+.RS 3n
+Do not show the splash screen.
 .RE
 .PP
 \fB\-s \fR\fB\fIWxH\fR\fR \fB\-\-size=\fR\fB\fIWxH\fR\fR
-.RS 4
-Export loaded file in decimal given width and/or height\&. It is allowed to only select width or height\&. 
E\&.g\&.
+.RS 3n
+Export loaded file in decimal given width and/or height. It is allowed to only select width or height. E.g.
 \fB\-\-size=\fR\fB\fI520x\fR\fR
 exports an image that is 520 pixels wide, while
 \fB\-\-size=\fR\fB\fIx900\fR\fR
-exports an image of 900 pixels height\&.
-.if n \{\
+exports an image of 900 pixels height.
 .sp
-.\}
-.RS 4
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.ps +1
 \fBNote\fR
-.ps -1
-.br
-This option is currently only implemented for the PNG export filter\&.
-.sp .5v
-.RE
+This option is currently only implemented for the PNG export filter.
 .RE
 .PP
-\fB\-L \fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR \fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR
-.RS 4
-Only include specified layers when exporting\&. Layers can be specified either as a layer name, the layer 
number or a numeric range X\-Y of layers\&. \-\-show\-layers=background,2\-5 shows the layer named background 
and layers 2\-5, \-\-show\-layers=2\- shows layers 2 and up\&.
+\fB\-L \fR\fB\fILAYER,LAYER,...\fR\fR \fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,...\fR\fR
+.RS 3n
+Only include specified layers when exporting. Layers can be specified either as a layer name, the layer 
number or a numeric range X\-Y of layers. \-\-show\-layers=background,2\-5 shows the layer named background 
and layers 2\-5, \-\-show\-layers=2\- shows layers 2 and up.
 .RE
 .PP
 \fB\-t \fR\fB\fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fR\fB\fIFORMAT\fR\fR
-.RS 4
-Export loaded file in FORMAT and exit\&. Format are described below\&.
+.RS 3n
+Export loaded file in FORMAT and exit. Format are described below.
 .RE
 .PP
 \fB\-v\fR \fB\-\-version\fR
-.RS 4
+.RS 3n
 Display
 \fBdia\fR
-version and exit\&.
+version and exit.
 .RE
 .SH "EXPORT FORMATS"
 .PP
 The following export formats are supported by
-\fBdia\fR\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+\fBdia\fR.
+.TP 3n
+\(bu
 cgm
 (Computer Graphics Metafile, ISO 8632)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 dia
 (Native dia diagram)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 dxf
 (Drawing Interchange File)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 eps
 or
 eps\-builtin
@@ -164,199 +117,82 @@ and
 eps\-pango
 both use the font renderer of the Pango library, while
 eps\-builtin
-uses a dia specific font renderer\&. If you have problems with Pango rendering, e\&.g\&. Unicode, try
+uses a dia specific font renderer. If you have problems with Pango rendering, e.g. Unicode, try
 eps\-builtin
-instead\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+instead.
+.TP 3n
+\(bu
 fig
 (XFig format)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 mp
 (TeX MetaPost macros)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 plt
 or
 hpgl
 (HP Graphics Language)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 png
 (Portable Network Graphics)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 shape
 (Dia Shape File)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 svg
 (Scalable Vector Graphics)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-tex
+.TP 3n
+\(bu
+pstricks\-tex
 (TeX PSTricks macros)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
+pgf\-tex
+(TeX PGF/tikz macros)
+.TP 3n
+\(bu
 wpg
 (WordPerfect Graphics)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 wmf
 (Windows MetaFile)
-.RE
 .SH "FILES"
 .PP
 \fBdia\fR
 creates a directory
-\&.dia
-in the user\'s home, which contains different files to store user preferences\&. To reset
+\fI.dia\fR
+in the user's home, which contains different files to store user preferences. To reset
 \fBdia\fR
-to it\'s default behaviour, just remove the respective file:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-defaults\&.dia: contains default values for elements (XML format)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-diarc: keeps
+to it's default behaviour, just remove the respective file:
+.TP 3n
+\(bu
+\fIdefaults.dia\fR: contains default values for elements (XML format).
+.TP 3n
+\(bu
+\fIdiarc\fR: keeps
 \fBdia\fR
-preferences (ASCII)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-history: keeps the list of last edited diagrams (ASCII)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-menurc: contains an automated accelerator map dump (Lisp)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-persistence: contains GUI information, e\&.g\&. open windows (XML)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-pluginrc: the list of loaded plugins (XML)\&.
-.RE
+preferences (ASCII).
+.TP 3n
+\(bu
+\fIhistory\fR: keeps the list of last edited diagrams (ASCII).
+.TP 3n
+\(bu
+\fImenurc\fR: contains an automated accelerator map dump (Lisp).
+.TP 3n
+\(bu
+\fIpersistence\fR: contains GUI information, e.g. open windows (XML).
+.TP 3n
+\(bu
+\fIpluginrc\fR: the list of loaded plugins (XML).
 .SH "SEE ALSO"
 .PP
-\m[blue]\fBPango\fR\m[]\&\s-2\u[1]\d\s+2
+[1]\&\fIPango\fR
 .PP
 X (1)
 .PP
@@ -365,38 +201,35 @@ xfig (1)
 inkscape (1)
 .SH "COPYRIGHT"
 .PP
-Copyright 1999 Alexander Larsson\&.
+Copyright 1999 Alexander Larsson.
 .PP
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and 
without fee is hereby granted, provided that the above copyright notice appear in all copies and that both 
that copyright notice and this permission notice appear in supporting documentation\&.
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and 
without fee is hereby granted, provided that the above copyright notice appear in all copies and that both 
that copyright notice and this permission notice appear in supporting documentation.
 .SH "AUTHORS"
 .PP
 Alexander Larsson
 .PP
 This manual was written by
-Fredrik Hallenberg\&.
+Fredrik Hallenberg.
 .SH "AUTHORS"
 .PP
-\fBFredrik Hallenberg\fR <\&hallon lysator\&.liu\&.se\&>
-.RS 4
+\fBFredrik Hallenberg\fR <\&hallon lysator liu se\&>
+.sp -1n
+.IP "" 3n
 Author.
-.RE
 .PP
-\fBW\&. Borgert\fR <\&debacle debian\&.org\&>
-.RS 4
+\fBW. Borgert\fR <\&debacle debian org\&>
+.sp -1n
+.IP "" 3n
 Author.
-.RE
 .PP
-\fBAlan Horkan\fR <\&horkana tcd\&.ie\&>
-.RS 4
+\fBAlan Horkan\fR <\&horkana tcd ie\&>
+.sp -1n
+.IP "" 3n
 Author.
-.RE
 .SH "COPYRIGHT"
-.br
 Copyright \(co 1999, 2004 Fredrik Hallenberg, W. Borgert, Alan Horkan
 .br
-.SH "NOTES"
-.IP " 1." 4
-Pango
-.RS 4
+.SH "REFERENCES"
+.TP 3
+1.\ Pango
 \%http://www.pango.org/
-.RE
diff --git a/doc/eu/dia.1 b/doc/eu/dia.1
index a902a7f..fd4a8fb 100644
--- a/doc/eu/dia.1
+++ b/doc/eu/dia.1
@@ -1,156 +1,109 @@
-'\" t
 .\"     Title: dia
 .\"    Author: Fredrik Hallenberg <hallon lysator liu se>
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 2004-11-26
-.\"    Manual: [FIXME: manual]
-.\"    Source: [FIXME: source]
-.\"  Language: English
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 2004.11.26
+.\"    Manual: 
+.\"    Source: 
 .\"
-.TH "DIA" "1" "2004\-11\-26" "[FIXME: source]" "[FIXME: manual]"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
+.TH "DIA" "1" "2004\-11\-26" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
 .SH "NAME"
 dia \- a diagram drawing program
 .SH "SYNOPSIS"
-.HP \w'\fBdia\fR\ 'u
-\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] 
[\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-L\ \fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR] 
[\fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] 
[\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ 
\fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \&.\&.\&.]
+.HP 4
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fR\fB\fIOUTPUT\fR\fR] 
[\fB\-\-export=\fR\fB\fIOUTPUT\fR\fR] [\fB\-L\ \fR\fB\fILAYER,LAYER,...\fR\fR] 
[\fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,...\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] 
[\fB\-\-nosplash\fR] [\fB\-s\ \fR\fB\fIWxH\fR\fR] [\fB\-\-size=\fR\fB\fIWxH\fR\fR] [\fB\-t\ 
\fR\fB\fIFORMAT\fR\fR] [\fB\-\-filter=\fR\fB\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ ...]
 .SH "DESCRIPTION"
 .PP
 \fBDia\fR
-is used to create diagrams\&. Dia has a number of basic tools, like lines and boxes but can also dynamically 
load
-\fIsheets\fR\&. A sheet is a collection of tools that are used in a certain type of diagram\&.
+is used to create diagrams. Dia has a number of basic tools, like lines and boxes but can also dynamically 
load
+\fIsheets\fR. A sheet is a collection of tools that are used in a certain type of diagram.
 .PP
 Most diagram objects in
 \fBDia\fR
 have
-\fIconnection points\fR\&. Lines can be connected to these connection points and this way graph structures 
can be formed\&. When objects are moved or resized the connections will follow the objects\&.
+\fIconnection points\fR. Lines can be connected to these connection points and this way graph structures can 
be formed. When objects are moved or resized the connections will follow the objects.
 .PP
 Diagrams drawn in
 \fBDia\fR
-can be exported as PostScript\&.
+can be exported as PostScript.
 .SH "OPTIONS"
 .PP
 \fBDia\fR
 accepts the following options:
 .PP
 \fB\-c\fR \fB\-\-credits\fR
-.RS 4
-Display credits list and exit\&.
+.RS 3n
+Display credits list and exit.
 .RE
 .PP
 \fB\-e \fR\fB\fIOUTPUT\fR\fR \fB\-\-export=\fR\fB\fIOUTPUT\fR\fR
-.RS 4
-Export loaded file to OUTPUT and exit\&.
+.RS 3n
+Export loaded file to OUTPUT and exit.
 .RE
 .PP
 \fB\-h\fR \fB\-\-help\fR
-.RS 4
-Display a list of all commandline options\&.
+.RS 3n
+Display a list of all commandline options.
 .RE
 .PP
 \fB\-n\fR \fB\-\-nosplash\fR
-.RS 4
-Do not show the splash screen\&.
+.RS 3n
+Do not show the splash screen.
 .RE
 .PP
 \fB\-s \fR\fB\fIWxH\fR\fR \fB\-\-size=\fR\fB\fIWxH\fR\fR
-.RS 4
-Export loaded file in decimal given width and/or height\&. It is allowed to only select width or height\&. 
E\&.g\&.
+.RS 3n
+Export loaded file in decimal given width and/or height. It is allowed to only select width or height. E.g.
 \fB\-\-size=\fR\fB\fI520x\fR\fR
 exports an image that is 520 pixels wide, while
 \fB\-\-size=\fR\fB\fIx900\fR\fR
-exports an image of 900 pixels height\&.
-.if n \{\
+exports an image of 900 pixels height.
 .sp
-.\}
-.RS 4
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.ps +1
 \fBNote\fR
-.ps -1
-.br
-This option is currently only implemented for the PNG export filter\&.
-.sp .5v
-.RE
+This option is currently only implemented for the PNG export filter.
 .RE
 .PP
-\fB\-L \fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR \fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,\&.\&.\&.\fR\fR
-.RS 4
-Only include specified layers when exporting\&. Layers can be specified either as a layer name, the layer 
number or a numeric range X\-Y of layers\&. \-\-show\-layers=background,2\-5 shows the layer named background 
and layers 2\-5, \-\-show\-layers=2\- shows layers 2 and up\&.
+\fB\-L \fR\fB\fILAYER,LAYER,...\fR\fR \fB\-\-show\-layers=\fR\fB\fILAYER,LAYER,...\fR\fR
+.RS 3n
+Only include specified layers when exporting. Layers can be specified either as a layer name, the layer 
number or a numeric range X\-Y of layers. \-\-show\-layers=background,2\-5 shows the layer named background 
and layers 2\-5, \-\-show\-layers=2\- shows layers 2 and up.
 .RE
 .PP
 \fB\-t \fR\fB\fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fR\fB\fIFORMAT\fR\fR
-.RS 4
-Export loaded file in FORMAT and exit\&. Format are described below\&.
+.RS 3n
+Export loaded file in FORMAT and exit. Format are described below.
 .RE
 .PP
 \fB\-v\fR \fB\-\-version\fR
-.RS 4
+.RS 3n
 Display
 \fBdia\fR
-version and exit\&.
+version and exit.
 .RE
 .SH "EXPORT FORMATS"
 .PP
 The following export formats are supported by
-\fBdia\fR\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+\fBdia\fR.
+.TP 3n
+\(bu
 cgm
 (Computer Graphics Metafile, ISO 8632)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 dia
 (Native dia diagram)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 dxf
 (Drawing Interchange File)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 eps
 or
 eps\-builtin
@@ -164,199 +117,82 @@ and
 eps\-pango
 both use the font renderer of the Pango library, while
 eps\-builtin
-uses a dia specific font renderer\&. If you have problems with Pango rendering, e\&.g\&. Unicode, try
+uses a dia specific font renderer. If you have problems with Pango rendering, e.g. Unicode, try
 eps\-builtin
-instead\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+instead.
+.TP 3n
+\(bu
 fig
 (XFig format)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 mp
 (TeX MetaPost macros)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 plt
 or
 hpgl
 (HP Graphics Language)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 png
 (Portable Network Graphics)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 shape
 (Dia Shape File)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 svg
 (Scalable Vector Graphics)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-tex
+.TP 3n
+\(bu
+pstricks\-tex
 (TeX PSTricks macros)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
+pgf\-tex
+(TeX PGF/tikz macros)
+.TP 3n
+\(bu
 wpg
 (WordPerfect Graphics)
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
+.TP 3n
+\(bu
 wmf
 (Windows MetaFile)
-.RE
 .SH "FILES"
 .PP
 \fBdia\fR
 creates a directory
-\&.dia
-in the user\'s home, which contains different files to store user preferences\&. To reset
+\fI.dia\fR
+in the user's home, which contains different files to store user preferences. To reset
 \fBdia\fR
-to it\'s default behaviour, just remove the respective file:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-defaults\&.dia: contains default values for elements (XML format)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-diarc: keeps
+to it's default behaviour, just remove the respective file:
+.TP 3n
+\(bu
+\fIdefaults.dia\fR: contains default values for elements (XML format).
+.TP 3n
+\(bu
+\fIdiarc\fR: keeps
 \fBdia\fR
-preferences (ASCII)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-history: keeps the list of last edited diagrams (ASCII)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-menurc: contains an automated accelerator map dump (Lisp)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-persistence: contains GUI information, e\&.g\&. open windows (XML)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-pluginrc: the list of loaded plugins (XML)\&.
-.RE
+preferences (ASCII).
+.TP 3n
+\(bu
+\fIhistory\fR: keeps the list of last edited diagrams (ASCII).
+.TP 3n
+\(bu
+\fImenurc\fR: contains an automated accelerator map dump (Lisp).
+.TP 3n
+\(bu
+\fIpersistence\fR: contains GUI information, e.g. open windows (XML).
+.TP 3n
+\(bu
+\fIpluginrc\fR: the list of loaded plugins (XML).
 .SH "SEE ALSO"
 .PP
-\m[blue]\fBPango\fR\m[]\&\s-2\u[1]\d\s+2
+[1]\&\fIPango\fR
 .PP
 X (1)
 .PP
@@ -365,38 +201,35 @@ xfig (1)
 inkscape (1)
 .SH "COPYRIGHT"
 .PP
-Copyright 1999 Alexander Larsson\&.
+Copyright 1999 Alexander Larsson.
 .PP
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and 
without fee is hereby granted, provided that the above copyright notice appear in all copies and that both 
that copyright notice and this permission notice appear in supporting documentation\&.
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and 
without fee is hereby granted, provided that the above copyright notice appear in all copies and that both 
that copyright notice and this permission notice appear in supporting documentation.
 .SH "AUTHORS"
 .PP
 Alexander Larsson
 .PP
 This manual was written by
-Fredrik Hallenberg\&.
+Fredrik Hallenberg.
 .SH "AUTHORS"
 .PP
-\fBFredrik Hallenberg\fR <\&hallon lysator\&.liu\&.se\&>
-.RS 4
+\fBFredrik Hallenberg\fR <\&hallon lysator liu se\&>
+.sp -1n
+.IP "" 3n
 Author.
-.RE
 .PP
-\fBW\&. Borgert\fR <\&debacle debian\&.org\&>
-.RS 4
+\fBW. Borgert\fR <\&debacle debian org\&>
+.sp -1n
+.IP "" 3n
 Author.
-.RE
 .PP
-\fBAlan Horkan\fR <\&horkana tcd\&.ie\&>
-.RS 4
+\fBAlan Horkan\fR <\&horkana tcd ie\&>
+.sp -1n
+.IP "" 3n
 Author.
-.RE
 .SH "COPYRIGHT"
-.br
 Copyright \(co 1999, 2004 Fredrik Hallenberg, W. Borgert, Alan Horkan
 .br
-.SH "NOTES"
-.IP " 1." 4
-Pango
-.RS 4
+.SH "REFERENCES"
+.TP 3
+1.\ Pango
 \%http://www.pango.org/
-.RE
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f06a754..cf18864 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -236,7 +236,7 @@ AM_CPPFLAGS = \
 
 sheetdir = $(pkgdatadir)/sheets
 
-INCLUDES = -I$(top_srcdir)/intl $(DEBUG_FLAGS) $(GDK_PIXBUF_CFLAGS) \
+AM_CPPFLAGS += -I$(top_srcdir)/intl $(DEBUG_FLAGS) $(GDK_PIXBUF_CFLAGS) \
   $(XML_CFLAGS) $(GNOME_CFLAGS) $(GTK_CFLAGS) \
   -DDIA_SHEETDIR=\"$(sheetdir)\" \
   $(PANGOFT2_CFLAGS) $(LIBART_CFLAGS) $(UNICODE_CFLAGS)
diff --git a/objects/AADL/Makefile.am b/objects/AADL/Makefile.am
index 08360e6..608eff2 100755
--- a/objects/AADL/Makefile.am
+++ b/objects/AADL/Makefile.am
@@ -25,7 +25,7 @@ libaadl_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
 
 libaadl_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST =   pixmaps/aadlbus.xpm                \
diff --git a/objects/Database/Makefile.am b/objects/Database/Makefile.am
index 5e69071..097192c 100644
--- a/objects/Database/Makefile.am
+++ b/objects/Database/Makefile.am
@@ -12,7 +12,7 @@ libdb_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libdb_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/ER/Makefile.am b/objects/ER/Makefile.am
index dc1020d..db72211 100644
--- a/objects/ER/Makefile.am
+++ b/objects/ER/Makefile.am
@@ -12,7 +12,7 @@ liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 liber_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/FS/Makefile.am b/objects/FS/Makefile.am
index bead336..00b2235 100644
--- a/objects/FS/Makefile.am
+++ b/objects/FS/Makefile.am
@@ -11,7 +11,7 @@ libfs_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libfs_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/GRAFCET/Makefile.am b/objects/GRAFCET/Makefile.am
index 0c3dc66..b73a572 100644
--- a/objects/GRAFCET/Makefile.am
+++ b/objects/GRAFCET/Makefile.am
@@ -19,7 +19,7 @@ libgrafcet_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDE
 
 libgrafcet_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/Istar/Makefile.am b/objects/Istar/Makefile.am
index 0786b54..543377b 100644
--- a/objects/Istar/Makefile.am
+++ b/objects/Istar/Makefile.am
@@ -13,7 +13,7 @@ libistar_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFI
 
 libistar_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/Jackson/Makefile.am b/objects/Jackson/Makefile.am
index ebe2768..cbd1fe4 100644
--- a/objects/Jackson/Makefile.am
+++ b/objects/Jackson/Makefile.am
@@ -12,7 +12,7 @@ libjackson_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDE
 
 libjackson_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/KAOS/Makefile.am b/objects/KAOS/Makefile.am
index ff4df03..0581192 100644
--- a/objects/KAOS/Makefile.am
+++ b/objects/KAOS/Makefile.am
@@ -13,7 +13,7 @@ libkaos_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
 
 libkaos_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/Misc/Makefile.am b/objects/Misc/Makefile.am
index 306fae4..d303f22 100644
--- a/objects/Misc/Makefile.am
+++ b/objects/Misc/Makefile.am
@@ -14,7 +14,7 @@ libmisc_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
 
 libmisc_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/SADT/Makefile.am b/objects/SADT/Makefile.am
index aa20d95..3e0e1df 100644
--- a/objects/SADT/Makefile.am
+++ b/objects/SADT/Makefile.am
@@ -12,7 +12,7 @@ libsadt_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
 
 libsadt_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/UML/Makefile.am b/objects/UML/Makefile.am
index b939f45..2e2533a 100644
--- a/objects/UML/Makefile.am
+++ b/objects/UML/Makefile.am
@@ -45,7 +45,7 @@ libuml_objects_la_SOURCES = \
 libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libuml_objects_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/chronogram/Makefile.am b/objects/chronogram/Makefile.am
index a4ea71c..b2174d4 100644
--- a/objects/chronogram/Makefile.am
+++ b/objects/chronogram/Makefile.am
@@ -14,7 +14,7 @@ libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_U
 
 libchronogram_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/custom/Makefile.am b/objects/custom/Makefile.am
index bcfb1f5..4884759 100644
--- a/objects/custom/Makefile.am
+++ b/objects/custom/Makefile.am
@@ -18,7 +18,7 @@ libcustom_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 shapedir = $(pkgdatadir)/shapes
 
 # add -DDEBUG_CUSTOM here to get extra debugging info.
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS) \
        $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
        -DDIA_SHAPEDIR=\""$(shapedir)"\"
 
diff --git a/objects/custom_lines/Makefile.am b/objects/custom_lines/Makefile.am
index 6b8598e..14b07cf 100644
--- a/objects/custom_lines/Makefile.am
+++ b/objects/custom_lines/Makefile.am
@@ -12,7 +12,7 @@ libcustom_lines_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO
 
 libcustom_lines_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
diff --git a/objects/flowchart/Makefile.am b/objects/flowchart/Makefile.am
index 2c068f2..2d35174 100644
--- a/objects/flowchart/Makefile.am
+++ b/objects/flowchart/Makefile.am
@@ -12,7 +12,7 @@ libflowchart_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UN
 
 libflowchart_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/network/Makefile.am b/objects/network/Makefile.am
index 6a81e53..415db32 100644
--- a/objects/network/Makefile.am
+++ b/objects/network/Makefile.am
@@ -13,7 +13,7 @@ libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDE
 
 libnetwork_objects_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/objects/standard/Makefile.am b/objects/standard/Makefile.am
index 640d4aa..58d88bb 100644
--- a/objects/standard/Makefile.am
+++ b/objects/standard/Makefile.am
@@ -53,7 +53,7 @@ tool-icons.h: $(ICON_PNGS)
 
 BUILT_SOURCES = tool-icons.h
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/plug-ins/cairo/Makefile.am b/plug-ins/cairo/Makefile.am
index 2a26287..8108764 100644
--- a/plug-ins/cairo/Makefile.am
+++ b/plug-ins/cairo/Makefile.am
@@ -16,4 +16,4 @@ libcairo_filter_la_SOURCES = $(plugin_sources)
 libcairo_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libcairo_filter_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
diff --git a/plug-ins/cgm/Makefile.am b/plug-ins/cgm/Makefile.am
index f2165e9..8054728 100644
--- a/plug-ins/cgm/Makefile.am
+++ b/plug-ins/cgm/Makefile.am
@@ -8,4 +8,4 @@ libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libcgm_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_CFLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_CFLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/drs/Makefile.am b/plug-ins/drs/Makefile.am
index cc26994..cc25d61 100644
--- a/plug-ins/drs/Makefile.am
+++ b/plug-ins/drs/Makefile.am
@@ -17,7 +17,7 @@ libdrs_filter_la_SOURCES = $(plugin_sources)
 libdrs_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libdrs_filter_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS)
 
 # Prevent installation - currently a debug tool only
 install-pkglibLTLIBRARIES:
diff --git a/plug-ins/dxf/Makefile.am b/plug-ins/dxf/Makefile.am
index 7b9a89a..c0809be 100644
--- a/plug-ins/dxf/Makefile.am
+++ b/plug-ins/dxf/Makefile.am
@@ -13,4 +13,4 @@ libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libdxf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/hpgl/Makefile.am b/plug-ins/hpgl/Makefile.am
index a8eb7b4..9b9b878 100644
--- a/plug-ins/hpgl/Makefile.am
+++ b/plug-ins/hpgl/Makefile.am
@@ -5,4 +5,4 @@ libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINE
 
 libhpgl_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/layout/Makefile.am b/plug-ins/layout/Makefile.am
index bfbef50..2af8fe4 100644
--- a/plug-ins/layout/Makefile.am
+++ b/plug-ins/layout/Makefile.am
@@ -20,7 +20,7 @@ if OS_WIN32
 liblayout_filter_la_LIBADD += -lpsapi
 endif
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib -I$(top_srcdir)/app \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib -I$(top_srcdir)/app \
   $(DEBUG_FLAGS) $(GTK_CFLAGS) $(OGDF_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/plug-ins/libart/Makefile.am b/plug-ins/libart/Makefile.am
index 36267ff..8a5b05c 100644
--- a/plug-ins/libart/Makefile.am
+++ b/plug-ins/libart/Makefile.am
@@ -17,4 +17,4 @@ libart_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libart_filter_la_LIBADD = $(LIBART_LIBS) $(LIBPNG_LIBS) $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(LIBART_CFLAGS) $(LIBPNG_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(LIBART_CFLAGS) $(LIBPNG_CFLAGS)
diff --git a/plug-ins/metapost/Makefile.am b/plug-ins/metapost/Makefile.am
index 011ee7e..0f6d9dc 100644
--- a/plug-ins/metapost/Makefile.am
+++ b/plug-ins/metapost/Makefile.am
@@ -11,4 +11,4 @@ libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDE
 
 libmetapost_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/pdf/Makefile.am b/plug-ins/pdf/Makefile.am
index 6c8527b..4004511 100644
--- a/plug-ins/pdf/Makefile.am
+++ b/plug-ins/pdf/Makefile.am
@@ -13,7 +13,7 @@ libpdf_filter_la_SOURCES = $(plugin_sources)
 libpdf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libpdf_filter_la_LIBADD = $(POPPLER_LIBS) $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(POPPLER_CFLAGS) $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 # Prevent installation
diff --git a/plug-ins/pgf/Makefile.am b/plug-ins/pgf/Makefile.am
index 78852ef..f9a0c32 100644
--- a/plug-ins/pgf/Makefile.am
+++ b/plug-ins/pgf/Makefile.am
@@ -11,4 +11,4 @@ libpgf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libpgf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/pixbuf/Makefile.am b/plug-ins/pixbuf/Makefile.am
index 336e36c..279ba27 100644
--- a/plug-ins/pixbuf/Makefile.am
+++ b/plug-ins/pixbuf/Makefile.am
@@ -9,4 +9,4 @@ libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFI
 
 libpixbuf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/postscript/Makefile.am b/plug-ins/postscript/Makefile.am
index 9f8c80d..260003a 100644
--- a/plug-ins/postscript/Makefile.am
+++ b/plug-ins/postscript/Makefile.am
@@ -43,4 +43,4 @@ if OS_WIN32
 libpostscript_filter_la_LIBADD += -lwinspool
 endif
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
diff --git a/plug-ins/pstricks/Makefile.am b/plug-ins/pstricks/Makefile.am
index 9af9b82..b63c78c 100644
--- a/plug-ins/pstricks/Makefile.am
+++ b/plug-ins/pstricks/Makefile.am
@@ -11,4 +11,4 @@ libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDE
 
 libpstricks_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/python/Makefile.am b/plug-ins/python/Makefile.am
index 6c38acc..1801528 100644
--- a/plug-ins/python/Makefile.am
+++ b/plug-ins/python/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/intl \
        -I$(top_srcdir)/lib \
diff --git a/plug-ins/shape/Makefile.am b/plug-ins/shape/Makefile.am
index 7332016..bfb88f4 100644
--- a/plug-ins/shape/Makefile.am
+++ b/plug-ins/shape/Makefile.am
@@ -10,6 +10,6 @@ libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
 
 libshape_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(XML_CFLAGS)
 
diff --git a/plug-ins/stress/Makefile.am b/plug-ins/stress/Makefile.am
index afda604..e93c998 100644
--- a/plug-ins/stress/Makefile.am
+++ b/plug-ins/stress/Makefile.am
@@ -11,7 +11,7 @@ libstress_filter_la_SOURCES = $(plugin_sources)
 libstress_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libstress_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(DEBUG_FLAGS) $(GTK_CFLAGS)
 
 # Prevent installation
diff --git a/plug-ins/svg/Makefile.am b/plug-ins/svg/Makefile.am
index 23e6f45..653c28d 100644
--- a/plug-ins/svg/Makefile.am
+++ b/plug-ins/svg/Makefile.am
@@ -8,5 +8,5 @@ libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libsvg_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
        $(DEBUG_FLAGS) $(GTK_CFLAGS) $(XML_CFLAGS)
diff --git a/plug-ins/vdx/Makefile.am b/plug-ins/vdx/Makefile.am
index 8d968a2..e4d8ec5 100644
--- a/plug-ins/vdx/Makefile.am
+++ b/plug-ins/vdx/Makefile.am
@@ -15,4 +15,4 @@ libvdx_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libvdx_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/wmf/Makefile.am b/plug-ins/wmf/Makefile.am
index b57f875..939fdde 100644
--- a/plug-ins/wmf/Makefile.am
+++ b/plug-ins/wmf/Makefile.am
@@ -17,7 +17,7 @@ libwmf_filter_la_LIBADD += -lcomdlg32
 plugin_sources += paginate_gdiprint.cpp paginate_gdiprint.h
 endif
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(DEBUG_FLAGS) $(GTK_CFLAGS) $(LIBEMF_CFLAGS)
 
 EXTRA_DIST = \
diff --git a/plug-ins/wpg/Makefile.am b/plug-ins/wpg/Makefile.am
index 65c17c7..ba145b9 100644
--- a/plug-ins/wpg/Makefile.am
+++ b/plug-ins/wpg/Makefile.am
@@ -5,5 +5,5 @@ libwpg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
 
 libwpg_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/xfig/Makefile.am b/plug-ins/xfig/Makefile.am
index fa2a3ca..ee6e92b 100644
--- a/plug-ins/xfig/Makefile.am
+++ b/plug-ins/xfig/Makefile.am
@@ -13,4 +13,4 @@ libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINE
 
 libxfig_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/xslt/Makefile.am b/plug-ins/xslt/Makefile.am
index e379715..2fd3896 100644
--- a/plug-ins/xslt/Makefile.am
+++ b/plug-ins/xslt/Makefile.am
@@ -25,7 +25,7 @@ libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINE
 
 libxslt_filter_la_LIBADD = $(XSLT_LIBS) $(top_builddir)/lib/libdia.la
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) 
$(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
 
 if !HAVE_XSLT  
 # Prevent installation
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e32f28..962668d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,7 @@ test: $(TEST_PROGS)
 # rum make test as part of make check
 check-local: test
 
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/lib $(GTK_CFLAGS)
+AM_CPPFLAGS = -g -I$(top_srcdir) -I$(top_srcdir)/lib $(GTK_CFLAGS)
 
 noinst_PROGRAMS = $(TEST_PROGS)
 progs_ldadd = $(top_builddir)/lib/libdia.la $(GTK_LIBS)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]