*/Makefile.am: merge INCLUDES into AM_CPPFLAGS

automake-1.13 finally warns about this anachronism.
This commit is contained in:
Michael Natterer 2013-06-05 20:48:37 +02:00
parent bfb83109bc
commit ec786816bb
64 changed files with 261 additions and 314 deletions

View file

@ -107,9 +107,7 @@ endif
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \
-DGIMP_APP_GLUE_COMPILATION
INCLUDES = \
-DGIMP_APP_GLUE_COMPILATION \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(PANGOCAIRO_CFLAGS) \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Actions\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -9,9 +9,7 @@ libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
INCLUDES = \
-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -2,9 +2,7 @@
AM_CPPFLAGS = \
-DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\" \
-DG_LOG_DOMAIN=\"Gimp-Core\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Core\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Dialogs\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Dialogs\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Display\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Display\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-File\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-File\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-GEGL\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-GEGL\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -2,9 +2,7 @@
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-GUI\" \
-DGIMP_COMMAND=\"@GIMP_COMMAND@\"
INCLUDES = \
-DGIMP_COMMAND=\"@GIMP_COMMAND@\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Menus\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Menus\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -2,9 +2,7 @@
SUBDIRS = tests
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Operations\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Operations\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Paint\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-PDB\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-PDB\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Plug-In\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Plug-In\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Text\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Text\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Tools\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Tools\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Vectors\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Vectors\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -3,9 +3,7 @@
AM_CPPFLAGS = \
-DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\" \
-DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\" \
-DG_LOG_DOMAIN=\"Gimp-Widgets\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-Widgets\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-XCF\"
INCLUDES = \
-DG_LOG_DOMAIN=\"Gimp-XCF\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \

View file

@ -14,9 +14,9 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
AM_CPPFLAGS = $(GTK_CFLAGS) -DTOP_SRCDIR=\"$(top_srcdir)\"
INCLUDES = \
AM_CPPFLAGS = \
$(GTK_CFLAGS) \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-I$(top_srcdir) \
$(GEGL_CFLAGS)

View file

@ -64,9 +64,7 @@ gimpincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimp
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimp\" \
-DGIMP_COMPILATION
INCLUDES = \
-DGIMP_COMPILATION \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -58,19 +58,17 @@ AM_CPPFLAGS = \
-DGIMP_SYSCONF_VERSION=\"$(GIMP_SYSCONF_VERSION)\" \
-DGIMP_PLUGIN_VERSION=\"$(GIMP_PLUGIN_VERSION)\" \
-DG_LOG_DOMAIN=\"LibGimpBase\" \
-DGIMP_BASE_COMPILATION
AM_CCASFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)
INCLUDES = \
-DGIMP_BASE_COMPILATION \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(BINRELOC_CFLAGS) \
-I$(includedir) \
$(xobjective_c)
AM_CCASFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir)
EXTRA_DIST = \
gimpbase.def

View file

@ -48,9 +48,7 @@ libgimpcolorincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpcolor
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpColor\" \
-DGIMP_COLOR_COMPILATION
INCLUDES = \
-DGIMP_COLOR_COMPILATION \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
$(CAIRO_CFLAGS) \

View file

@ -45,9 +45,7 @@ libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpConfig\" \
-DGIMP_CONFIG_COMPILATION
INCLUDES = \
-DGIMP_CONFIG_COMPILATION \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
$(CAIRO_CFLAGS) \

View file

@ -48,9 +48,7 @@ libgimpmathincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmath
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpMath\" \
-DGIMP_MATH_COMPILATION
INCLUDES = \
-DGIMP_MATH_COMPILATION \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
-I$(includedir)

View file

@ -43,9 +43,7 @@ libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpModule\" \
-DGIMP_MODULE_COMPILATION
INCLUDES = \
-DGIMP_MODULE_COMPILATION \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
$(GMODULE_NO_EXPORT_CFLAGS) \

View file

@ -46,9 +46,7 @@ libgimpthumbincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpthumb
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpThumb\" \
-DGIMP_THUMB_COMPILATION
INCLUDES = \
-DGIMP_THUMB_COMPILATION \
-I$(top_srcdir) \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \

View file

@ -50,9 +50,7 @@ libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"LibGimpWidgets\" \
-DGIMP_WIDGETS_COMPILATION
INCLUDES = \
-DGIMP_WIDGETS_COMPILATION \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
$(GTK_CFLAGS) \

View file

@ -12,7 +12,7 @@ endif
libdir = $(gimpplugindir)/modules
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GEGL_CFLAGS) \
$(GTK_CFLAGS) \

View file

@ -41,7 +41,7 @@ color_rotate_SOURCES = \
color-rotate-stock.c \
color-rotate-stock.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -37,7 +37,7 @@ EXTRA_DIST = \
plugin-defs.pl \
gimprc.common
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -88,7 +88,7 @@ EXTRA_DIST = \\
plugin-defs.pl$extra \\
$rcfile
INCLUDES = \\
AM_CPPFLAGS = \\
-I\$(top_srcdir) \\
\$(GTK_CFLAGS) \\
\$(GEGL_CFLAGS) \\

View file

@ -29,7 +29,7 @@ file_bmp_SOURCES = \
bmp-read.c \
bmp-write.c
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -19,7 +19,7 @@ libexec_PROGRAMS = file-compressor
file_compressor_SOURCES = \
file-compressor.c
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -21,7 +21,7 @@ AM_LDFLAGS = $(mwindows)
libexecdir = $(gimpplugindir)/plug-ins
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -28,7 +28,7 @@ file_faxg3_SOURCES = \
g3.c \
g3.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(CAIRO_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \

View file

@ -29,7 +29,7 @@ file_fits_SOURCES = \
fits-io.c \
fits-io.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -28,7 +28,7 @@ file_fli_SOURCES = \
fli.c \
fli-gimp.c
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -35,7 +35,7 @@ file_ico_SOURCES = \
ico-save.c \
ico-save.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -21,7 +21,7 @@ AM_LDFLAGS = $(mwindows)
libexecdir = $(gimpplugindir)/plug-ins
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(EXIF_CFLAGS) \

View file

@ -47,7 +47,7 @@ EXTRA_DIST = \
TODO.txt \
new-resource-ids.txt
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(EXIF_CFLAGS) \

View file

@ -28,7 +28,7 @@ file_sgi_SOURCES = \
sgi-lib.c \
sgi-lib.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -44,7 +44,7 @@ file_uri_SOURCES = \
uri-backend.h \
$(backend_sources)
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(backend_cflags) \
$(GTK_CFLAGS) \

View file

@ -35,7 +35,7 @@ flame_SOURCES = \
rect.c \
rect.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -33,7 +33,7 @@ fractal_explorer_SOURCES = \
fractal-explorer.c \
fractal-explorer.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -64,7 +64,7 @@ gfig_SOURCES = \
EXTRA_DIST = README
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -22,16 +22,15 @@ gimpressionist_RC = gimpressionist.rc.o
endif
AM_CPPFLAGS = \
-DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\"
AM_LDFLAGS = $(mwindows)
INCLUDES = \
-DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\" \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \
-I$(includedir)
AM_LDFLAGS = $(mwindows)
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = gimpressionist

View file

@ -29,7 +29,7 @@ libexec_PROGRAMS = gradient-flare
gradient_flare_SOURCES = gradient-flare.c
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -25,7 +25,7 @@ libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = help-browser
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(WEBKIT_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -16,7 +16,14 @@ include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
help_RC = help.rc.o
endif
AM_CPPFLAGS = -DDATADIR=\""$(gimpdatadir)"\"
AM_CPPFLAGS = \
-DDATADIR=\""$(gimpdatadir)"\" \
-I$(top_srcdir) \
$(CAIRO_CFLAGS) \
$(GIO_CFLAGS) \
$(GEGL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
AM_LDFLAGS = $(mwindows)
@ -42,14 +49,6 @@ libexec_PROGRAMS = help
help_SOURCES = help.c
INCLUDES = \
-I$(top_srcdir) \
$(CAIRO_CFLAGS) \
$(GIO_CFLAGS) \
$(GEGL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
LDADD = \
$(libgimphelp) \
$(libgimp) \

View file

@ -33,7 +33,7 @@ ifs_compose_SOURCES = \
EXTRA_DIST = README.ifscompose
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -131,7 +131,7 @@ imagemap_SOURCES = \
imap_taglist.c \
imap_taglist.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -43,7 +43,7 @@ lighting_SOURCES = \
lighting-ui.c \
lighting-ui.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -43,7 +43,7 @@ map_object_SOURCES = \
map-object-ui.c \
map-object-ui.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -33,7 +33,7 @@ maze_SOURCES = \
maze-utils.c \
maze-utils.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -61,7 +61,7 @@ xmpdump_SOURCES = \
xmp-parse.h \
xmp-parse.c
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -30,7 +30,7 @@ nodist_pagecurl_SOURCES = pagecurl-icons.h
BUILT_SOURCES = pagecurl-icons.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -19,7 +19,7 @@ endif
AM_LDFLAGS = $(mwindows)
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -21,7 +21,12 @@ endif
AM_CFLAGS = $(PYGIMP_EXTRA_CFLAGS)
INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GEGL_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS)
pygimpbase = python

View file

@ -33,7 +33,7 @@ AM_CFLAGS = \
-DUSE_INTERFACE=1 \
-DUSE_STRLWR=0
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -51,7 +51,7 @@ EXTRA_DIST = \
README \
README.limn
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -53,7 +53,7 @@ EXTRA_DIST = \
tw_win.c \
tw_mac.c
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -25,7 +25,7 @@ EXTRA_DIST = \
winsnap.ico \
winsnap.rc
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \

View file

@ -63,9 +63,7 @@ AM_CPPFLAGS = \
-DGIMPDATADIR=\""$(gimpdatadir)"\" \
-DCC=\""$(CC)"\" \
-DGIMPDIR=\""$(gimpdir)"\" \
-DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"
INCLUDES = \
-DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)