procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

*/Makefile.am: merge INCLUDES into AM_CPPFLAGS

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
app/Makefile.am
View file

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

4
app/actions/Makefile.am
View file

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

4
app/config/Makefile.am
View file

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

4
app/core/Makefile.am
View file

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

4
app/dialogs/Makefile.am
View file

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

4
app/display/Makefile.am
View file

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

4
app/file/Makefile.am
View file

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

4
app/gegl/Makefile.am
View file

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

4
app/gui/Makefile.am
View file

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

4
app/menus/Makefile.am
View file

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

4
app/operations/Makefile.am
View file

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

4
app/paint/Makefile.am
View file

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

4
app/pdb/Makefile.am
View file

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

4
app/plug-in/Makefile.am
View file

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

4
app/text/Makefile.am
View file

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

4
app/tools/Makefile.am
View file

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

4
app/vectors/Makefile.am
View file

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

4
app/widgets/Makefile.am
View file

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

4
app/xcf/Makefile.am
View file

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

6
devel-docs/tools/Makefile.am
View file

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

4
libgimp/Makefile.am
View file

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

12
libgimpbase/Makefile.am
View file

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

4
libgimpcolor/Makefile.am
View file

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

4
libgimpconfig/Makefile.am
View file

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

4
libgimpmath/Makefile.am
View file

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

4
libgimpmodule/Makefile.am
View file

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

4
libgimpthumb/Makefile.am
View file

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

4
libgimpwidgets/Makefile.am
View file

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

2
modules/Makefile.am
View file

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

2
plug-ins/color-rotate/Makefile.am
View file

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

2
plug-ins/common/Makefile.am
View file

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

2
plug-ins/common/mkgen.pl
View file

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

2
plug-ins/file-bmp/Makefile.am
View file

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

2
plug-ins/file-compressor/Makefile.am
View file

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

2
plug-ins/file-exr/Makefile.am
View file

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

2
plug-ins/file-faxg3/Makefile.am
View file

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

2
plug-ins/file-fits/Makefile.am
View file

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

2
plug-ins/file-fli/Makefile.am
View file

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

2
plug-ins/file-ico/Makefile.am
View file

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

2
plug-ins/file-jpeg/Makefile.am
View file

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

2
plug-ins/file-psd/Makefile.am
View file

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

2
plug-ins/file-sgi/Makefile.am
View file

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

2
plug-ins/file-uri/Makefile.am
View file

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

2
plug-ins/flame/Makefile.am
View file

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

2
plug-ins/fractal-explorer/Makefile.am
View file

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

2
plug-ins/gfig/Makefile.am
View file

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

9
plug-ins/gimpressionist/Makefile.am
View file

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

2
plug-ins/gradient-flare/Makefile.am
View file

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

2
plug-ins/help-browser/Makefile.am
View file

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

17
plug-ins/help/Makefile.am
View file

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

2
plug-ins/ifs-compose/Makefile.am
View file

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

2
plug-ins/imagemap/Makefile.am
View file

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

2
plug-ins/lighting/Makefile.am
View file

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

2
plug-ins/map-object/Makefile.am
View file

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

2
plug-ins/maze/Makefile.am
View file

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

2
plug-ins/metadata/Makefile.am
View file

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

2
plug-ins/pagecurl/Makefile.am
View file

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

2
plug-ins/print/Makefile.am
View file

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

7
plug-ins/pygimp/Makefile.am
View file

@ -21,7 +21,12 @@ endif
AM_CFLAGS = $(PYGIMP_EXTRA_CFLAGS) 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 pygimpbase = python

2
plug-ins/script-fu/Makefile.am
View file

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

2
plug-ins/selection-to-path/Makefile.am
View file

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

2
plug-ins/twain/Makefile.am
View file

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

2
plug-ins/win-snap/Makefile.am
View file

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

4
tools/Makefile.am
View file

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