Commit 62e7dcc6 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

reorder sections consistently. Remove redundant CFLAGS.

2008-10-07  Michael Natterer  <mitch@gimp.org>

	* app/*/Makefile.am: reorder sections consistently. Remove
	redundant CFLAGS.


svn path=/trunk/; revision=27163
parent 891b4525
2008-10-07 Michael Natterer <mitch@gimp.org>
* app/*/Makefile.am: reorder sections consistently. Remove
redundant CFLAGS.
2008-10-06 Sven Neumann <sven@gimp.org>
* plug-ins/common/file-gif-load.c (GetCode): be more tolerant and
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappactions.a
libappactions_a_SOURCES = \
......@@ -162,18 +174,4 @@ libappactions_a_SOURCES = \
windows-commands.c \
windows-commands.h
EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Base\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappbase.a
libappbase_a_SOURCES = \
......@@ -63,21 +74,8 @@ libappbase_a_SOURCES = \
tile-swap.c \
tile-swap.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Base\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
#
# rules to generate built sources
#
......
......@@ -7,6 +7,18 @@ libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappconfig.a
libappconfig_a_SOURCES = \
......@@ -39,20 +51,6 @@ libappconfig_a_SOURCES = \
gimpxmlparser.c \
gimpxmlparser.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
-DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_PROGRAMS = test-config
EXTRA_DIST = makefile.msc
......@@ -104,5 +102,4 @@ test_config_LDADD = \
$(GEGL_LIBS) \
$(GLIB_LIBS)
CLEANFILES = $(EXTRA_PROGRAMS) foorc
......@@ -9,10 +9,9 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GEGL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappcore.a
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Display\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappdisplay.a
libappdisplay_a_sources = \
......@@ -74,18 +86,6 @@ libappdisplay_a_SOURCES = \
$(libappdisplay_a_built_sources) \
$(libappdisplay_a_sources)
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Display\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
#
......
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libappfile.a
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-File\"
......@@ -11,9 +9,10 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappfile.a
libappfile_a_SOURCES = \
file-open.c \
file-open.h \
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-GEGL\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappgegl.a
libappgegl_a_SOURCES = \
......@@ -50,13 +62,3 @@ libappgegl_a_SOURCES = \
gimpoperationtilesink.h \
gimpoperationtilesource.c \
gimpoperationtilesource.h
INCLUDES = \
-I. \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Menus\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappmenus.a
libappmenus_a_SOURCES = \
......@@ -21,17 +32,4 @@ libappmenus_a_SOURCES = \
windows-menu.c \
windows-menu.h
EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Menus\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\"
AM_CCASFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/app
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapppaint-funcs.a
libapppaint_funcs_a_SOURCES = \
......@@ -14,20 +30,4 @@ libapppaint_funcs_a_SOURCES = \
subsample-region.c \
subsample-region.h
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\"
AM_CCASFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/app
EXTRA_DIST = makefile.msc
......@@ -9,7 +9,6 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapppaint.a
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-PDB\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapppdb.a libappinternal-procs.a
libapppdb_a_SOURCES = \
......@@ -69,17 +81,4 @@ libappinternal_procs_a_SOURCES = \
unit-cmds.c \
vectors-cmds.c
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-PDB\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GEGL_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
......@@ -9,7 +9,6 @@ INCLUDES = \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappplug-in.a
......
......@@ -10,7 +10,6 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(PANGOFT2_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapptext.a
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Tools\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapptools.a
libapptools_a_sources = \
......@@ -183,19 +195,6 @@ libapptools_a_built_sources = tools-enums.c
libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources)
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Tools\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
#
......
......@@ -8,9 +8,8 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappvectors.a
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-XCF\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappxcf.a
libappxcf_a_SOURCES = \
......@@ -17,16 +28,4 @@ libappxcf_a_SOURCES = \
xcf-write.c \
xcf-write.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-XCF\"
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GDK_PIXBUF_CFLAGS) \
$(GLIB_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment