gegl r2106 - in trunk: . operations operations/affine operations/external

[mitch svn gnome org]

Author: mitch
Date: Fri Feb 22 13:58:38 2008
New Revision: 2106
URL: http://svn.gnome.org/viewvc/gegl?rev=2106&view=rev

Log:
2008-02-22  Michael Natterer  <mitch gimp org>

	* operations/Makefile-operations.am
	* operations/affine/Makefile.am
	* operations/external/Makefile.am: clean up includes.



Modified:
   trunk/ChangeLog
   trunk/operations/Makefile-operations.am
   trunk/operations/affine/Makefile.am
   trunk/operations/external/Makefile.am

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Fri Feb 22 13:58:38 2008
@@ -13,19 +13,22 @@
 
 all-local: $(SOBJS)
 
-AM_CPPFLAGS = @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
-           -I$(srcdir) -I$(top_srcdir)           \
-           -I$(top_builddir)                     \
-           -I$(top_srcdir)/gegl                  \
-           -I$(top_srcdir)/gegl/buffer           \
-           -I$(top_srcdir)/gegl/operation        \
-           -I$(top_srcdir)/gegl/property-types   \
-           -I$(top_srcdir)/gegl/module           \
-           -I
+AM_CPPFLAGS = \
+	@DEP_CFLAGS@				\
+	@BABL_CFLAGS@				\
+	@CPPFLAGS@				\
+	-I$(srcdir)				\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/buffer		\
+	-I$(top_srcdir)/gegl/operation		\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/module
 
 AM_LDFLAGS = -avoid-version -module $(no_undefined)
 
-LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
+LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
 
 %.lo: %.c $(GEGLHEADERS)
 	@echo $(LIBTOOL) --tag=CC --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $@ $<
@@ -37,7 +40,6 @@
 	perl -pi -e 's/^relink_command=.*/relink_command=/g' $@
 
 
-
 clean-local:
 	rm -f *.la $(OFILES)
 

Modified: trunk/operations/affine/Makefile.am
==============================================================================
--- trunk/operations/affine/Makefile.am	(original)
+++ trunk/operations/affine/Makefile.am	Fri Feb 22 13:58:38 2008
@@ -3,15 +3,18 @@
 no_undefined = -no-undefined
 endif
 
-INCLUDES = @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
-	   -I$(srcdir) -I$(top_srcdir)           \
-           -I$(top_builddir)                     \
-           -I$(top_srcdir)/gegl                  \
-           -I$(top_srcdir)/gegl/buffer           \
-           -I$(top_srcdir)/gegl/operation        \
-           -I$(top_srcdir)/gegl/property-types   \
-           -I$(top_srcdir)/gegl/module           \
-           -I.
+INCLUDES = \
+	@DEP_CFLAGS@				\
+	@BABL_CFLAGS@				\
+	@CPPFLAGS@				\
+	-I$(srcdir)				\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/buffer		\
+	-I$(top_srcdir)/gegl/operation		\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/module
 
 affine_ladir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
 
@@ -27,8 +30,4 @@
 	shear.c		\
 	translate.c
 
-affine_la_LDFLAGS = \
-    -module          \
-    -avoid-version   \
-    $(no_undefined)  \
-    $(mwindows) 
+affine_la_LDFLAGS = -module -avoid-version $(no_undefined) $(mwindows) 

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Fri Feb 22 13:58:38 2008
@@ -3,21 +3,24 @@
 no_undefined = -no-undefined
 endif
 
-INCLUDES = @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
-           -I$(srcdir) -I$(top_srcdir)           \
-           -I$(top_builddir)                     \
-           -I$(top_srcdir)/gegl                  \
-           -I$(top_srcdir)/gegl/buffer           \
-           -I$(top_srcdir)/gegl/operation        \
-           -I$(top_srcdir)/gegl/property-types   \
-           -I$(top_srcdir)/gegl/module           \
-           -I.
+INCLUDES = \
+	@DEP_CFLAGS@				\
+	@BABL_CFLAGS@				\
+	@CPPFLAGS@				\
+	-I$(srcdir)				\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/buffer		\
+	-I$(top_srcdir)/gegl/operation		\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/module
+
 AM_LDFLAGS = -avoid-version -module $(no_undefined)
+
 libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 
 op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
-### the stuff above this line could potentially be moved to a common file
-### to reduce duplication
 
 # start out with no ops, each if/endif block contains all the bits relevant
 # for a specific dependency.