GNOME.org
 

gegl r3003 - in trunk: . bin bindings/gegl-sharp/docs bindings/pygegl/Gegl examples gegl gegl/buffer gegl/graph gegl/module gegl/operation gegl/process gegl/property-types operations operations/affine operations/external operations/workshop/external tests tests/buffer tools

Author: martinn
Date: Tue Mar 31 20:18:56 2009
New Revision: 3003
URL: http://svn.gnome.org/viewvc/gegl?rev=3003&view=rev

Log:
Don't use depecrated features or reduntant declarations in Makefile.am

Patch from Gary V. Vaughan

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/bin/Makefile.am
   trunk/bindings/gegl-sharp/docs/Makefile.am
   trunk/bindings/pygegl/Gegl/Makefile.am
   trunk/examples/Makefile.am
   trunk/gegl/Makefile.am
   trunk/gegl/buffer/Makefile.am
   trunk/gegl/graph/Makefile.am
   trunk/gegl/module/Makefile.am
   trunk/gegl/operation/Makefile.am
   trunk/gegl/process/Makefile.am
   trunk/gegl/property-types/Makefile.am
   trunk/operations/Makefile-common.am
   trunk/operations/Makefile-operations.am
   trunk/operations/affine/Makefile.am
   trunk/operations/external/Makefile.am
   trunk/operations/workshop/external/Makefile.am
   trunk/tests/Makefile.am
   trunk/tests/buffer/Makefile.am
   trunk/tools/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -40,4 +40,5 @@
 dist-hook: dist-check-w3m
 
 website: all
-	$(MAKE) -C docs website
\ No newline at end of file
+	$(MAKE) -C docs website
+

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,29 +1,38 @@
-bin_PROGRAMS = gegl
+if OS_WIN32
+no_undefined = -no-undefined
+endif
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/operation \
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/module \
+	-I$(top_srcdir)/gegl/module
 
-libbuffer = $(top_builddir)/gegl/buffer/libbuffer.la
-libmodule = $(top_builddir)/gegl/module/libmodule.la
+AM_CFLAGS = \
+	$(DEP_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
 
 
+AM_LDFLAGS =  \
+	$(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \
+	$(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO)
+
+bin_PROGRAMS = gegl
+
 gegl_SOURCES =			\
 	gegl.c			\
 	gegl-options.c		\
 	gegl-options.h		\
 	gegl-path-smooth.c	\
-	gegl-path-smooth.h	\
-        $(gui_sources)
+	gegl-path-smooth.h
 
 if HAVE_SPIRO
 gegl_SOURCES += gegl-path-spiro.h gegl-path-spiro.c
 endif
 
-INCLUDES = \
-	-I$(top_srcdir)	-I$(top_srcdir)/gegl -I$(top_srcdir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/property-types \
-	-I$(top_srcdir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/operation \
-	-I$(top_srcdir)/gegl/module \
-	@DEP_CFLAGS@ @BABL_CFLAGS@ @PNG_CFLAGS@
-
-AM_LDFLAGS =  \
-	-no-undefined ../gegl/libgegl- GEGL_API_VERSION@.la \
-	@DEP_LIBS@ @BABL_LIBS@ @PNG_LIBS@ @LIBSPIRO@

Modified: trunk/bindings/gegl-sharp/docs/Makefile.am
==============================================================================
--- trunk/bindings/gegl-sharp/docs/Makefile.am	(original)
+++ trunk/bindings/gegl-sharp/docs/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,5 +1,5 @@
-DOC_UPDATER = @MONODOCER@ -delete
-DOC_ASSEMBLER = @MDASSEMBLER@ --out gegl-sharp-docs --ecma
+DOC_UPDATER = $(MONODOCER) -delete
+DOC_ASSEMBLER = $(MDASSEMBLER) --out gegl-sharp-docs --ecma
 
 ASSEMBLIES = ../gegl/gegl-sharp.dll
 

Modified: trunk/bindings/pygegl/Gegl/Makefile.am
==============================================================================
--- trunk/bindings/pygegl/Gegl/Makefile.am	(original)
+++ trunk/bindings/pygegl/Gegl/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,6 +1,6 @@
-INCLUDES = $(PYTHON_INCLUDES) $(PYGOBJECT_CFLAGS) $(GEGL_CFLAGS)
+AM_CPPFLAGS = $(PYTHON_INCLUDES)
 
-AM_CFLAGS = $(PYGEGL_EXTRA_CFLAGS)
+AM_CFLAGS = $(PYGOBJECT_CFLAGS) $(GEGL_CFLAGS) $(PYGEGL_EXTRA_CFLAGS)
 
 pygegldir = $(pyexecdir)/Gegl
 pygegl_PYTHON = __init__.py fifthleg.py

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -7,22 +7,30 @@
 
 all-local: $(bins)
 
+%: %.c $(GEGLHEADERS)
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $<
+	$(LIBTOOL) --mode=link    $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ $  lo $(LIBS)
+
 clean-local:
 	rm -f *.lo $(bins)
 
-INCLUDES = \
-	-I$(top_builddir) \
-	-I$(top_srcdir)	-I$(top_srcdir)/gegl -I$(top_srcdir)/gegl/buffer \
+AM_CPPFLAGS = \
+	-I$(top_srcdir)	\
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/buffer \
 	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/operation \
 	-I$(top_srcdir)/gegl/operation \
-	-I$(top_srcdir)/gegl/module \
-	@DEP_CFLAGS@ @GTK_CFLAGS@ @BABL_CFLAGS@ @PNG_CFLAGS@
+	-I$(top_builddir)/gegl/module \
+	-I$(top_srcdir)/gegl/module
 
-AM_LDFLAGS =  \
-	../gegl/libgegl- GEGL_API_VERSION@.la \
-	@DEP_LIBS@ @GTK_LIBS@ @BABL_LIBS@ @PNG_LIBS@
+AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
 
-%: %.c $(GEGLHEADERS)
-	$(LIBTOOL) --mode=compile $(CC) $< -c -o $  lo $(INCLUDES) -DHAVE_CONFIG_H
-	$(LIBTOOL) --mode=link    $(CC) $  lo -o $@ $(AM_LDFLAGS)
+AM_LDFLAGS =  \
+	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
+	$(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)

Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am	(original)
+++ trunk/gegl/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -4,14 +4,47 @@
 
 SUBDIRS = buffer graph module operation process property-types
 
-libbuffer = $(top_builddir)/gegl/buffer/libbuffer.la
-libmodule = $(top_builddir)/gegl/module/libmodule.la
-liboperation = $(top_builddir)/gegl/operation/liboperation.la
-libgraph = $(top_builddir)/gegl/graph/libgraph.la
-libprocess = $(top_builddir)/gegl/process/libprocess.la
-libpropertytypes = $(top_builddir)/gegl/property-types/libpropertytypes.la
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/operation \
+	-I$(top_srcdir)/gegl/operation \
+	-DLIBDIR=\""$(libdir)"\" \
+	-DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\"
 
-lib_LTLIBRARIES = libgegl- GEGL_API_VERSION@.la
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
+AM_LDFLAGS = \
+	$(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
+
+LIBS = \
+	$(top_builddir)/gegl/buffer/libbuffer.la \
+	$(top_builddir)/gegl/module/libmodule.la \
+	$(top_builddir)/gegl/operation/liboperation.la \
+	$(top_builddir)/gegl/graph/libgraph.la \
+	$(top_builddir)/gegl/process/libprocess.la \
+	$(top_builddir)/gegl/property-types/libpropertytypes.la \
+	$(DEP_LIBS) $(BABL_LIBS)
+
+GEGL_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)
+
+GEGL_public_HEADERS =	\
+    gegl.h				\
+    gegl-types.h			\
+    gegl-utils.h			\
+    gegl-matrix.h			\
+    gegl-chant.h			\
+    gegl-simd.h				\
+    gegl-plugin.h			\
+    gegl-version.h			\
+    buffer/gegl-buffer.h		\
+    property-types/gegl-paramspecs.h	\
+    property-types/gegl-color.h		\
+    property-types/gegl-path.h		\
+    property-types/gegl-curve.h
 
 GEGL_sources = \
 	gegl-config.c			\
@@ -36,44 +69,7 @@
 	gegl-types-internal.h		\
 	gegl-xml.h
 
-libgegl_ GEGL_API_VERSION@_la_SOURCES = $(GEGL_sources) $(GEGL_public_headers)
-
-libgegl_ GEGL_API_VERSION@_la_LIBADD =	\
-	$(libbuffer) 	\
-	$(libmodule) 	\
-	$(liboperation) \
-	$(libgraph) 	\
-	$(libprocess)	\
-	$(libpropertytypes)
-
-libgegl_ GEGL_API_VERSION@_la_LDFLAGS = \
-	@DEP_LIBS@ @BABL_LIBS@	\
-	$(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
-
-INCLUDES = \
-	-I$(top_srcdir)	\
-	-I$(top_srcdir)/gegl/buffer	\
-	-I$(top_srcdir)/gegl/property-types	\
-	-I$(top_srcdir)/gegl/operation\
-	@DEP_CFLAGS@ @BABL_CFLAGS@
-
-AM_CPPFLAGS = \
-	-DLIBDIR=\""$(libdir)"\"	\
-	-DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\" 
+lib_LTLIBRARIES = libgegl- GEGL_API_VERSION@.la
 
-libgegl_ GEGL_API_VERSION@includedir = $(includedir)/gegl-$(GEGL_API_VERSION)
+libgegl_ GEGL_API_VERSION@_la_SOURCES = $(GEGL_sources) $(GEGL_public_HEADERS)
 
-libgegl_ GEGL_API_VERSION@include_HEADERS =	\
-    gegl.h				\
-    gegl-types.h			\
-    gegl-utils.h			\
-    gegl-matrix.h			\
-    gegl-chant.h			\
-    gegl-simd.h				\
-    gegl-plugin.h			\
-    gegl-version.h			\
-    buffer/gegl-buffer.h		\
-    property-types/gegl-paramspecs.h	\
-    property-types/gegl-color.h		\
-    property-types/gegl-path.h		\
-    property-types/gegl-curve.h

Modified: trunk/gegl/buffer/Makefile.am
==============================================================================
--- trunk/gegl/buffer/Makefile.am	(original)
+++ trunk/gegl/buffer/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,3 +1,14 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer
+
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
 noinst_LTLIBRARIES = libbuffer.la
 
 if HAVE_GIO
@@ -6,7 +17,7 @@
     $(null__)
 endif
 
-BUFFER_sources = \
+libbuffer_la_SOURCES = \
     $(GIO_SUPPORT_SOURCES)      \
     gegl-buffer.c		\
     gegl-buffer-access.c	\
@@ -37,9 +48,8 @@
     gegl-tile-handler-empty.c	\
     gegl-tile-handler-log.c	\
     gegl-tile-handler-zoom.c	\
-    gegl-id-pool.c
-
-BUFFER_headers = \
+    gegl-id-pool.c		\
+    \
     gegl-buffer.h		\
     gegl-buffer-private.h	\
     gegl-buffer-iterator.h	\
@@ -71,12 +81,3 @@
     gegl-tile-handler-zoom.h		\
     gegl-id-pool.h
 
-libbuffer_la_SOURCES = $(BUFFER_sources) $(BUFFER_headers)
-
-INCLUDES = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gegl			\
-	-I$(top_srcdir)/gegl/property-types	\
-	-I$(top_srcdir)/gegl/buffer		\
-	@DEP_CFLAGS@ @BABL_CFLAGS@
-

Modified: trunk/gegl/graph/Makefile.am
==============================================================================
--- trunk/gegl/graph/Makefile.am	(original)
+++ trunk/gegl/graph/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,29 +1,31 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer
+
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
 noinst_LTLIBRARIES = libgraph.la
 
-GRAPH_sources = \
+#libgraph_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/graph
+#libgraph_public_HEADERS = #
+
+libgraph_la_SOURCES = \
 	gegl-connection.c	\
 	gegl-node.c		\
 	gegl-pad.c		\
 	gegl-visitor.c		\
-	gegl-visitable.c
-
-
-GRAPH_headers = \
+	gegl-visitable.c	\
+	\
 	gegl-connection.h	\
 	gegl-node.h		\
 	gegl-pad.h		\
 	gegl-visitor.h		\
 	gegl-visitable.h
 
-
-libgraph_la_SOURCES = $(GRAPH_sources) $(GRAPH_headers)
-#libgraphinclude_HEADERS = #
-#libgraphincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/graph
-
-INCLUDES = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gegl			\
-	-I$(top_srcdir)/gegl/property-types	\
-	-I$(top_srcdir)/gegl/buffer		\
-	@DEP_CFLAGS@ @BABL_CFLAGS@
+#libgraph_la_SOURCES = $(libgraph_sources) $(libgraph_public_HEADERS)
 

Modified: trunk/gegl/module/Makefile.am
==============================================================================
--- trunk/gegl/module/Makefile.am	(original)
+++ trunk/gegl/module/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,22 +1,25 @@
-noinst_LTLIBRARIES = libmodule.la
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types
+
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
-MODULE_sources = 	\
-    gegldatafiles.c	\
-    geglmodule.c	\
-    geglmoduledb.c	
+noinst_LTLIBRARIES = libmodule.la
 
-MODULE_headers = 	\
-    gegldatafiles.h	\
-    geglmoduledb.h	\
-    geglmodule.h
+#libmodule_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/module
+#libmodule_public_HEADERS = #$(MODULE_headers)
 
-libmodule_la_SOURCES = $(MODULE_sources) $(MODULE_headers)
-#libmoduleinclude_HEADERS = #$(MODULE_headers)
-#libmoduleincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/module
+libmodule_la_SOURCES = \
+	gegldatafiles.c	\
+	geglmodule.c	\
+	geglmoduledb.c	\
+	gegldatafiles.h	\
+	geglmoduledb.h	\
+	geglmodule.h
 
-INCLUDES = \
-	   -I$(top_srcdir)			\
-	   -I$(top_srcdir)/gegl			\
-	   -I$(top_srcdir)/gegl/buffer		\
-	   -I$(top_srcdir)/gegl/property-types	\
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
+#libmodule_la_SOURCES = $(libmodule_sources) $(libmodule_public_HEADERS)

Modified: trunk/gegl/operation/Makefile.am
==============================================================================
--- trunk/gegl/operation/Makefile.am	(original)
+++ trunk/gegl/operation/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,6 +1,32 @@
-noinst_LTLIBRARIES = liboperation.la
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer
+
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
+liboperation_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)/operation
+
+liboperation_public_HEADERS = \
+	gegl-operation.h        	 \
+	gegl-operation-area-filter.h     \
+	gegl-operation-composer.h     	 \
+	gegl-operation-composer3.h     	 \
+	gegl-operation-filter.h       	 \
+	gegl-operation-meta.h       	 \
+	gegl-operation-point-composer.h  \
+	gegl-operation-point-composer3.h \
+	gegl-operation-point-filter.h    \
+	gegl-operation-point-render.h    \
+	gegl-operation-sink.h       	 \
+	gegl-operation-source.h          \
+	gegl-operation-temporal.h
 
-OPERATION_sources = \
+liboperation_sources = \
 	gegl-extension-handler.c	  \
 	gegl-operation.c        	  \
 	gegl-operation-area-filter.c      \
@@ -18,49 +44,12 @@
 	gegl-operation-processors.c       \
 	gegl-operation-context.c          \
 	gegl-operations.c
-
-OPERATION_headers = \
+	\
 	gegl-extension-handler.h	 \
-	gegl-operation.h        	 \
-	gegl-operation-area-filter.h     \
-	gegl-operation-composer.h     	 \
-	gegl-operation-composer3.h     	 \
-	gegl-operation-filter.h       	 \
-	gegl-operation-meta.h       	 \
-	gegl-operation-point-composer.h  \
-	gegl-operation-point-composer3.h \
-	gegl-operation-point-filter.h    \
-	gegl-operation-point-render.h    \
-	gegl-operation-sink.h       	 \
-	gegl-operation-source.h		 \
-	gegl-operation-temporal.h	 \
 	gegl-operation-context.h          \
 	gegl-operations.h
 
-public_headers = \
-	gegl-operation.h        	 \
-	gegl-operation-area-filter.h     \
-	gegl-operation-composer.h     	 \
-	gegl-operation-composer3.h     	 \
-	gegl-operation-filter.h       	 \
-	gegl-operation-meta.h       	 \
-	gegl-operation-point-composer.h  \
-	gegl-operation-point-composer3.h \
-	gegl-operation-point-filter.h    \
-	gegl-operation-point-render.h    \
-	gegl-operation-sink.h       	 \
-	gegl-operation-source.h          \
-	gegl-operation-temporal.h
-
+noinst_LTLIBRARIES = liboperation.la
 
-liboperation_la_SOURCES = $(OPERATION_sources) $(OPERATION_headers)
-liboperationinclude_HEADERS = $(public_headers)
-liboperationincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/operation
-
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gegl			\
-	-I$(top_srcdir)/gegl/property-types	\
-	-I$(top_srcdir)/gegl/buffer		\
-	@DEP_CFLAGS@ @BABL_CFLAGS@
+liboperation_la_SOURCES = $(liboperation_public_HEADERS) $(liboperation_sources)
 

Modified: trunk/gegl/process/Makefile.am
==============================================================================
--- trunk/gegl/process/Makefile.am	(original)
+++ trunk/gegl/process/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,6 +1,20 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer
+
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
 noinst_LTLIBRARIES = libprocess.la
 
-PROCESS_sources = 			\
+#libprocess_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/process
+#libprocess_public_HEADERS = #
+
+libprocess_la_SOURCES = \
 	gegl-cr-visitor.c		\
 	gegl-debug-rect-visitor.c	\
 	gegl-eval-mgr.c			\
@@ -8,11 +22,8 @@
 	gegl-finish-visitor.c		\
 	gegl-have-visitor.c		\
 	gegl-prepare-visitor.c		\
-	gegl-processor.c
-
-
-
-PROCESS_headers = 			\
+	gegl-processor.c		\
+	\
 	gegl-cr-visitor.h		\
 	gegl-debug-rect-visitor.h	\
 	gegl-eval-mgr.h			\
@@ -22,14 +33,5 @@
 	gegl-prepare-visitor.h		\
 	gegl-processor.h
 
+#libprocess_la_SOURCES = $(lib_process_sources) $(libprocess_public_HEADERS)
 
-libprocess_la_SOURCES = $(PROCESS_sources) $(PROCESS_headers)
-#libprocessinclude_HEADERS = #
-#libprocessincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/process
-
-INCLUDES = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gegl			\
-	-I$(top_srcdir)/gegl/property-types	\
-	-I$(top_srcdir)/gegl/buffer		\
-	@DEP_CFLAGS@ @BABL_CFLAGS@

Modified: trunk/gegl/property-types/Makefile.am
==============================================================================
--- trunk/gegl/property-types/Makefile.am	(original)
+++ trunk/gegl/property-types/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,24 +1,21 @@
-noinst_LTLIBRARIES = libpropertytypes.la
+AM_CPPFLAGS = \
+	-I$(top_srcdir)	\
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer
 
-PROPERTYTYPES_sources = \
-	gegl-color.c		\
-	gegl-curve.c		\
-	gegl-path.c		\
-	gegl-paramspecs.c
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
+noinst_LTLIBRARIES = libpropertytypes.la
 
-PROPERTYTYPES_headers = \
+libpropertytypes_la_SOURCES = \
+	gegl-color.c \
+	gegl-curve.c \
+	gegl-path.c \
+	gegl-paramspecs.c \
+	\
 	gegl-color.h		\
 	gegl-curve.h		\
 	gegl-path.h		\
 	gegl-paramspecs.h
-
-
-libpropertytypes_la_SOURCES = $(PROPERTYTYPES_sources) $(PROPERTYTYPES_headers)
-
-INCLUDES = \
-	   -I$(top_srcdir)	\
-	   -I$(top_srcdir)/gegl	\
-	   -I$(top_srcdir)/gegl/buffer \
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
-

Modified: trunk/operations/Makefile-common.am
==============================================================================
--- trunk/operations/Makefile-common.am	(original)
+++ trunk/operations/Makefile-common.am	Tue Mar 31 20:18:56 2009
@@ -1,25 +1,28 @@
 if OS_WIN32
 no_undefined = -no-undefined
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la @BABL_LIBS@
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la $(BABL_LIBS)
 endif
 
-op_libs = @DEP_LIBS@ $(libgegl)
+op_libs = $(DEP_LIBS) $(libgegl)
 
 GEGLHEADERS     = $(wildcard $(top_srcdir)/gegl/*.h)\
                   $(wildcard $(top_srcdir)/gegl/buffer/*.h)
 
 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) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/operation \
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/module \
 	-I$(top_srcdir)/gegl/module
 
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
 AM_LDFLAGS = -avoid-version -export-dynamic -module $(no_undefined)
-ext_dir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
+
+ext_dir = $(libdir)/gegl- GEGL_API_VERSION@

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Tue Mar 31 20:18:56 2009
@@ -1,9 +1,9 @@
 include $(top_srcdir)/operations/Makefile-common.am
 
-LDADD           = $(op_libs)
+LIBS            = $(op_libs)
 
 CFILES          = $(wildcard $(srcdir)/*.c)
-plugins           = $(subst $(srcdir)/,,$(CFILES:.c=.la))
+plugins         = $(subst $(srcdir)/,,$(CFILES:.c=.la))
 INSTALLED_ITEMS = $(subst $(srcdir)/,$(ext_dir)/,$(CFILES:.c=$(SHREXT)))
 EXTRA_DIST      = $(wildcard *.c) $(wildcard *.h)
 
@@ -11,12 +11,12 @@
 all-local: $(plugins)
 
 %.la: %.c $(GEGLHEADERS)
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $<
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) $(LDADD) -o $@ -rpath $(ext_dir) $  lo
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $<
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ -rpath $(ext_dir) $  lo $(LIBS) $(MATH_LIB)
 
 
 clean-local:
-	rm -f *.la $(OFILES)
+	rm -f *.la
 
 install-exec-local: all-local
 	$(INSTALL) -d $(ext_dir)

Modified: trunk/operations/affine/Makefile.am
==============================================================================
--- trunk/operations/affine/Makefile.am	(original)
+++ trunk/operations/affine/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -1,8 +1,10 @@
 include $(top_srcdir)/operations/Makefile-common.am
 
-affine_ladir = $(libdir)/gegl- GEGL_API_VERSION@
+LIBS = $(op_libs)
 
-affine_la_LTLIBRARIES = affine.la
+affinelibdir = $(libdir)/gegl-$(GEGL_API_VERSION)
+
+affinelib_LTLIBRARIES = affine.la
 
 affine_la_SOURCES = \
 	affine.c	\
@@ -16,5 +18,3 @@
 	transform.c	\
 	translate.c	\
 	chant.h
-
-affine_la_LIBADD = $(op_libs)

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -5,80 +5,69 @@
 ops =
 
 if HAVE_PANGOCAIRO
-text_la_SOURCES = text.c
-text_la_LIBADD = $(op_libs) $(PANGOCAIRO_LIBS)
-text_la_CFLAGS = $(PANGOCAIRO_CFLAGS)
 ops += text.la
+text_la_LIBADD = $(op_libs) $(PANGOCAIRO_LIBS)
+text_la_CFLAGS = $(AM_CFLAGS) $(PANGOCAIRO_CFLAGS)
 endif
 
 if HAVE_CAIRO
-path_la_SOURCES = path.c
-path_la_LIBADD = $(op_libs) $(CAIRO_LIBS)
-path_la_CFLAGS = $(CAIRO_CFLAGS)
 ops += path.la
+path_la_LIBADD = $(op_libs) $(CAIRO_LIBS)
+path_la_CFLAGS = $(AM_CFLAGS) $(CAIRO_CFLAGS)
 endif
 
 if HAVE_PNG
 ops += png-load.la png-save.la
-png_load_la_SOURCES = png-load.c
 png_load_la_LIBADD = $(op_libs) $(PNG_LIBS)
-png_load_la_CFLAGS = $(PNG_CFLAGS)
+png_load_la_CFLAGS = $(AM_CFLAGS) $(PNG_CFLAGS)
 
-png_save_la_SOURCES = png-save.c
 png_save_la_LIBADD = $(op_libs) $(PNG_LIBS)
-png_save_la_CFLAGS = $(PNG_CFLAGS)
+png_save_la_CFLAGS = $(AM_CFLAGS) $(PNG_CFLAGS)
 endif
 
 if HAVE_JPEG
 ops += jpg-load.la
-jpg_load_la_SOURCES = jpg-load.c
 jpg_load_la_LIBADD = $(op_libs) $(LIBJPEG)
 endif
 
 if HAVE_CAIRO
 if HAVE_RSVG
 ops += svg-load.la
-svg_load_la_SOURCES = svg-load.c
 svg_load_la_LIBADD = $(op_libs) $(CAIRO_LIBS) $(RSVG_LIBS)
-svg_load_la_CFLAGS = $(CAIRO_CFLAGS) $(RSVG_CFLAGS)
+svg_load_la_CFLAGS = $(AM_CFLAGS) $(CAIRO_CFLAGS) $(RSVG_CFLAGS)
 endif
 endif
 
 if HAVE_GDK_PIXBUF
 ops += pixbuf.la save-pixbuf.la
-pixbuf_la_SOURCES      = pixbuf.c
 pixbuf_la_LIBADD       = $(op_libs) $(GDK_PIXBUF_LIBS)
-pixbuf_la_CFLAGS       = $(GDK_PIXBUF_CFLAGS)
+pixbuf_la_CFLAGS       = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS)
 
-save_pixbuf_la_SOURCES = save-pixbuf.c
 save_pixbuf_la_LIBADD  = $(op_libs) $(GDK_PIXBUF_LIBS)
-save_pixbuf_la_CFLAGS  = $(GDK_PIXBUF_CFLAGS)
+save_pixbuf_la_CFLAGS  = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS)
 endif
 
 if HAVE_OPENEXR
 ops += exr-load.la
 exr_load_la_SOURCES = exr-load.cpp
 exr_load_la_LIBADD = $(op_libs) $(OPENEXR_LIBS)
-exr_load_la_CXXFLAGS = $(OPENEXR_CFLAGS)
+exr_load_la_CXXFLAGS = $(AM_CFLAGS) $(OPENEXR_CFLAGS)
 endif
 
 if HAVE_SDL
 ops += display.la
-display_la_SOURCES = display.c
 display_la_LIBADD = $(op_libs) $(SDL_LIBS)
-display_la_CFLAGS = $(SDL_CFLAGS)
+display_la_CFLAGS = $(AM_CFLAGS) $(SDL_CFLAGS)
 endif
 
 if HAVE_OPENRAW
 ops += openraw.la
-openraw_la_SOURCES = openraw.c
 openraw_la_LIBADD = $(op_libs) $(OPENRAW_LIBS)
-openraw_la_CFLAGS = $(OPENRAW_CFLAGS)
+openraw_la_CFLAGS = $(AM_CFLAGS) $(OPENRAW_CFLAGS)
 endif
 
 if HAVE_V4L
 ops += v4l.la
-v4l_la_SOURCES = v4l.c
 v4l_la_LIBADD = $(op_libs)
 endif
 
@@ -86,9 +75,8 @@
 
 if HAVE_AVFORMAT
 ops += ff-load.la
-ff_load_la_SOURCES = ff-load.c
 ff_load_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
-ff_load_la_CFLAGS = $(AVFORMAT_CFLAGS)
+ff_load_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
 endif
 
 opdir = $(libdir)/gegl- GEGL_API_VERSION@

Modified: trunk/operations/workshop/external/Makefile.am
==============================================================================
--- trunk/operations/workshop/external/Makefile.am	(original)
+++ trunk/operations/workshop/external/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -5,7 +5,6 @@
 ops =
 
 if HAVE_CAIRO
-line_profile_la_SOURCES = line-profile.c
 line_profile_la_LIBADD = $(op_libs) $(CAIRO_LIBS) $(PANGO_LIBS)
 line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS)
 ops += line_profile.la
@@ -13,7 +12,6 @@
 
 if HAVE_GTK
 ops += gtk_display.la
-gtk_display_la_SOURCES = gtk-display.c
 gtk_display_la_LIBADD  = $(op_libs) $(GTK_LIBS)
 gtk_display_la_CFLAGS  = $(GTK_CFLAGS)
 endif
@@ -27,7 +25,6 @@
 
 if HAVE_LUA
 ops += gluas.la
-gluas_la_SOURCES = gluas.c
 gluas_la_LIBADD  = $(op_libs) $(LUA_LIBS)
 gluas_la_CFLAGS  = $(LUA_CFLAGS)
 endif

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -5,30 +5,25 @@
 	GEGL_PATH=$(top_builddir)/operations/common:$(top_builddir)/operations/core
 
 # The tests
-TESTS = \
-	test-proxynop-processing$(EXEEXT)	\
-	test-gegl-rectangle$(EXEEXT)
-
-noinst_PROGRAMS = $(TESTS)
+check_PROGRAMS = \
+	test-proxynop-processing \
+	test-gegl-rectangle
 
 # Common CPPFLAGS
 AM_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gegl			\
-	-I$(top_srcdir)/gegl/buffer		\
-	-I$(top_srcdir)/gegl/property-types	\
-	-I$(top_srcdir)/gegl/operation		\
-	@DEP_CFLAGS@ @BABL_CFLAGS@
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/operation \
+	-I$(top_srcdir)/gegl/operation
 
-# Common libs
-testlibs = \
-	$(top_builddir)/gegl/libgegl- GEGL_API_VERSION@.la	\
-	@DEP_LIBS@ @BABL_LIBS@
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
-# Proxynop Processing
-test_proxynop_processing_SOURCES = test-proxynop-processing.c
-test_proxynop_processing_LDADD = $(testlibs)
+# Common libs
+LIBS = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la	\
+	$(DEP_LIBS) $(BABL_LIBS)
 
-# GeglRectangle
-test_gegl_rectangle_SOURCES = test-gegl-rectangle.c
-test_gegl_rectangle_LDADD = $(testlibs)

Modified: trunk/tests/buffer/Makefile.am
==============================================================================
--- trunk/tests/buffer/Makefile.am	(original)
+++ trunk/tests/buffer/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -6,21 +6,22 @@
 
 # Always build buffer-test to catch compilation problems early
 BUILT_SOURCES = buffer-tests.inc
-noinst_PROGRAMS = buffer-test$(EXEEXT)
-AM_CPPFLAGS =							\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/gegl					\
-	-I$(top_srcdir)/gegl/buffer				\
-	-I$(top_srcdir)/gegl/property-types			\
-	-I$(top_srcdir)/gegl/operation				\
-	@DEP_CFLAGS@ @BABL_CFLAGS@
-
-buffer_test_SOURCES =						\
-	buffer-test.c
+check_PROGRAMS = buffer-test
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/operation \
+	-I$(top_srcdir)/gegl/operation
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 buffer_test_LDADD = 						\
-	$(top_builddir)/gegl/libgegl- GEGL_API_VERSION@.la	\
-	@DEP_LIBS@ @BABL_LIBS@
+	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la	\
+	$(DEP_LIBS) $(BABL_LIBS)
 
 
 # Our custom target rules

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Tue Mar 31 20:18:56 2009
@@ -2,19 +2,21 @@
 
 EXTRA_DIST = xml_insert.sh create-reference.rb
 
-noinst_PROGRAMS = introspect operation_reference
-
-introspect_SOURCES = introspect.c
-operation_reference_SOURCES = operation_reference.c
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/gegl \
+	-I$(top_srcdir)/gegl \
+	-I$(top_builddir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/module \
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/property-types
 
-INCLUDES = -I$(top_srcdir) 		\
-	   -I$(top_srcdir)/gegl		\
-	   -I$(top_srcdir)/gegl/buffer	\
-	   -I$(top_srcdir)/gegl/module	\
-	   -I$(top_srcdir)/gegl/property-types\
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
+AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 AM_LDFLAGS = \
-	@DEP_LIBS@	\
-	@BABL_LIBS@	\
-	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
+	$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
+	$(DEP_LIBS) $(BABL_LIBS)
+
+noinst_PROGRAMS = introspect operation_reference
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]