GNOME.org
 

gimp r27163 - in trunk: . app/actions app/base app/config app/core app/display app/file app/gegl app/menus app/paint app/paint-funcs app/pdb app/plug-in app/text app/tools app/vectors app/xcf

Author: mitch
Date: Tue Oct  7 11:58:14 2008
New Revision: 27163
URL: http://svn.gnome.org/viewvc/gimp?rev=27163&view=rev

Log:
2008-10-07  Michael Natterer  <mitch gimp org>

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



Modified:
   trunk/ChangeLog
   trunk/app/actions/Makefile.am
   trunk/app/base/Makefile.am
   trunk/app/config/Makefile.am
   trunk/app/core/Makefile.am
   trunk/app/display/Makefile.am
   trunk/app/file/Makefile.am
   trunk/app/gegl/Makefile.am
   trunk/app/menus/Makefile.am
   trunk/app/paint-funcs/Makefile.am
   trunk/app/paint/Makefile.am
   trunk/app/pdb/Makefile.am
   trunk/app/plug-in/Makefile.am
   trunk/app/text/Makefile.am
   trunk/app/tools/Makefile.am
   trunk/app/vectors/Makefile.am
   trunk/app/xcf/Makefile.am

Modified: trunk/app/actions/Makefile.am
==============================================================================
--- trunk/app/actions/Makefile.am	(original)
+++ trunk/app/actions/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,17 @@
 ## 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 @@
 	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

Modified: trunk/app/base/Makefile.am
==============================================================================
--- trunk/app/base/Makefile.am	(original)
+++ trunk/app/base/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,16 @@
 ## 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 @@
 	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
 #

Modified: trunk/app/config/Makefile.am
==============================================================================
--- trunk/app/config/Makefile.am	(original)
+++ trunk/app/config/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -7,6 +7,18 @@
 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 @@
 	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 @@
 	$(GEGL_LIBS)				\
 	$(GLIB_LIBS)
 
-
 CLEANFILES = $(EXTRA_PROGRAMS) foorc

Modified: trunk/app/core/Makefile.am
==============================================================================
--- trunk/app/core/Makefile.am	(original)
+++ trunk/app/core/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -9,10 +9,9 @@
 	-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

Modified: trunk/app/display/Makefile.am
==============================================================================
--- trunk/app/display/Makefile.am	(original)
+++ trunk/app/display/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,17 @@
 ## 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_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
 
 #

Modified: trunk/app/file/Makefile.am
==============================================================================
--- trunk/app/file/Makefile.am	(original)
+++ trunk/app/file/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libappfile.a
-
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gimp-File\"
 
@@ -11,9 +9,10 @@
 	-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		\

Modified: trunk/app/gegl/Makefile.am
==============================================================================
--- trunk/app/gegl/Makefile.am	(original)
+++ trunk/app/gegl/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,17 @@
 ## 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 @@
 	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)

Modified: trunk/app/menus/Makefile.am
==============================================================================
--- trunk/app/menus/Makefile.am	(original)
+++ trunk/app/menus/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,16 @@
 ## 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 @@
 	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

Modified: trunk/app/paint-funcs/Makefile.am
==============================================================================
--- trunk/app/paint-funcs/Makefile.am	(original)
+++ trunk/app/paint-funcs/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,21 @@
 ## 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 @@
 	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

Modified: trunk/app/paint/Makefile.am
==============================================================================
--- trunk/app/paint/Makefile.am	(original)
+++ trunk/app/paint/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -9,7 +9,6 @@
 	-I$(top_builddir)/app	\
 	-I$(top_srcdir)/app	\
 	$(GDK_PIXBUF_CFLAGS)	\
-	$(GLIB_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapppaint.a

Modified: trunk/app/pdb/Makefile.am
==============================================================================
--- trunk/app/pdb/Makefile.am	(original)
+++ trunk/app/pdb/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,17 @@
 ## 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 @@
 	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

Modified: trunk/app/plug-in/Makefile.am
==============================================================================
--- trunk/app/plug-in/Makefile.am	(original)
+++ trunk/app/plug-in/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -9,7 +9,6 @@
 	-I$(top_builddir)/app	\
 	-I$(top_srcdir)/app	\
 	$(GDK_PIXBUF_CFLAGS)	\
-	$(GLIB_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libappplug-in.a

Modified: trunk/app/text/Makefile.am
==============================================================================
--- trunk/app/text/Makefile.am	(original)
+++ trunk/app/text/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -10,7 +10,6 @@
 	-I$(top_srcdir)/app	\
 	$(GDK_PIXBUF_CFLAGS)	\
 	$(PANGOFT2_CFLAGS)	\
-	$(GLIB_CFLAGS)		\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapptext.a

Modified: trunk/app/tools/Makefile.am
==============================================================================
--- trunk/app/tools/Makefile.am	(original)
+++ trunk/app/tools/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,17 @@
 ## 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_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
 
 #

Modified: trunk/app/vectors/Makefile.am
==============================================================================
--- trunk/app/vectors/Makefile.am	(original)
+++ trunk/app/vectors/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -8,9 +8,8 @@
 	-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

Modified: trunk/app/xcf/Makefile.am
==============================================================================
--- trunk/app/xcf/Makefile.am	(original)
+++ trunk/app/xcf/Makefile.am	Tue Oct  7 11:58:14 2008
@@ -1,5 +1,16 @@
 ## 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 @@
 	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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]