gegl r2090 - in trunk: . operations/external operations/io operations/render

[ok svn gnome org]

Author: ok
Date: Fri Feb 22 01:03:15 2008
New Revision: 2090
URL: http://svn.gnome.org/viewvc/gegl?rev=2090&view=rev

Log:
	* operations/external/Makefile.am: added a new libtooled makefile for
	operations with external dependencies.
	* operations/io/Makefile.am: trimmed away unused cruft.

	* operations/io/display.c:
	* operations/io/exr-load.cpp:
	* operations/io/ff-load.c:
	* operations/io/jpg-load.c:
	* operations/io/pixbuf.c:
	* operations/io/png-load.c:
	* operations/io/png-save.c:
	* operations/io/save-pixbuf.c:
	* operations/io/svg-load.c:
	* operations/render/text.c: moved ..
	* operations/external/: .. here


Added:
   trunk/operations/external/Makefile.am
   trunk/operations/external/display.c
      - copied unchanged from r2089, /trunk/operations/io/display.c
   trunk/operations/external/exr-load.cpp
      - copied unchanged from r2089, /trunk/operations/io/exr-load.cpp
   trunk/operations/external/ff-load.c
      - copied unchanged from r2089, /trunk/operations/io/ff-load.c
   trunk/operations/external/jpg-load.c
      - copied unchanged from r2089, /trunk/operations/io/jpg-load.c
   trunk/operations/external/pixbuf.c
      - copied unchanged from r2089, /trunk/operations/io/pixbuf.c
   trunk/operations/external/png-load.c
      - copied unchanged from r2089, /trunk/operations/io/png-load.c
   trunk/operations/external/png-save.c
      - copied unchanged from r2089, /trunk/operations/io/png-save.c
   trunk/operations/external/save-pixbuf.c
      - copied unchanged from r2089, /trunk/operations/io/save-pixbuf.c
   trunk/operations/external/svg-load.c
      - copied unchanged from r2089, /trunk/operations/io/svg-load.c
   trunk/operations/external/text.c
      - copied unchanged from r2089, /trunk/operations/render/text.c
Removed:
   trunk/operations/io/display.c
   trunk/operations/io/exr-load.cpp
   trunk/operations/io/ff-load.c
   trunk/operations/io/jpg-load.c
   trunk/operations/io/pixbuf.c
   trunk/operations/io/png-load.c
   trunk/operations/io/png-save.c
   trunk/operations/io/save-pixbuf.c
   trunk/operations/io/svg-load.c
   trunk/operations/render/text.c
Modified:
   trunk/ChangeLog
   trunk/operations/io/Makefile.am

Added: trunk/operations/external/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/operations/external/Makefile.am	Fri Feb 22 01:03:15 2008
@@ -0,0 +1,93 @@
+if OS_WIN32
+mwindows = -mwindows
+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.
+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.
+ops =
+
+if HAVE_CAIRO
+text_la_SOURCES = text.c
+text_la_LIBADD = $(op_libs) $(CAIRO_LIBS) $(PANGO_LIBS)
+text_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS)
+ops += text.la
+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_save_la_SOURCES = png-save.c
+png_save_la_LIBADD = $(op_libs) $(PNG_LIBS)
+png_save_la_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_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)
+endif
+
+if HAVE_GTK
+ops += pixbuf.la save_pixbuf.la
+pixbuf_la_SOURCES      = pixbuf.c
+pixbuf_la_LIBADD       = $(op_libs) $(CAIRO_LIBS) $(RSVG_LIBS)
+pixbuf_la_CFLAGS       = $(CAIRO_CFLAGS) $(RSVG_CFLAGS)
+
+save_pixbuf_la_SOURCES = save-pixbuf.c
+save_pixbuf_la_LIBADD  = $(op_libs) $(CAIRO_LIBS) $(RSVG_LIBS)
+save_pixbuf_la_CFLAGS  = $(CAIRO_CFLAGS) $(RSVG_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)
+endif
+
+if HAVE_SDL
+ops += display.la
+display_la_SOURCES = display.c
+display_la_LIBADD = $(op_libs) $(SDL_LIBS)
+display_la_CFLAGS = $(SDL_CFLAGS)
+endif
+
+if HAVE_AVCODEC
+if HAVE_AVFORMAT
+ops += ff_load.la
+ff_load_la_SOURCES = ff-load.c
+ff_load_la_LIBADD = $(op_libs) $(AVCODEC_LIBS) $(AVFORMAT_LIBS)
+ff_load_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS)
+endif
+endif
+
+opdir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
+op_LTLIBRARIES = $(ops)

Modified: trunk/operations/io/Makefile.am
==============================================================================
--- trunk/operations/io/Makefile.am	(original)
+++ trunk/operations/io/Makefile.am	Fri Feb 22 01:03:15 2008
@@ -1,61 +1 @@
 include $(top_srcdir)/operations/Makefile-operations-old.am
-
-CXXFILES         = $(wildcard $(srcdir)/*.cpp)
-SOBJS           += $(subst $(srcdir)/,,$(CXXFILES:.cpp=$(SHREXT)))
-INSTALLED_ITEMS += $(subst $(srcdir),$(ext_dir),$(CXXFILES:.cpp=$(SHREXT)))
-EXTRA_DIST      += $(wildcard *.cpp)
-
-
-
-ff-load$(SHREXT): ff-load.c $(GEGLHEADERS)
-	@if [ ! -z "$(AVCODEC_LIBS)" ]; then \
-	echo $@;\
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
-		$(AVCODEC_CFLAGS) $(AVCODEC_LIBS) \
-		$(AVFORMAT_CFLAGS) $(AVFORMAT_LIBS);\
-	fi
-
-jpg-load$(SHREXT): jpg-load.c $(GEGLHEADERS)
-	@if [ ! -z "$(LIBJPEG)" ]; then \
-	echo $@;\
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(LIBJPEG);\
-	fi
-
-png-load$(SHREXT): png-load.c $(GEGLHEADERS)
-	@echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(PNG_CFLAGS) $(PNG_LIBS)
-
-png-save$(SHREXT): png-save.c $(GEGLHEADERS)
-	@echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(PNG_CFLAGS) $(PNG_LIBS)
-
-svg-load$(SHREXT): svg-load.c $(GEGLHEADERS)
-	@if [ ! -z "$(RSVG_LIBS)" ]; then \
-	echo $@;\
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
-                                     $(CAIRO_CFLAGS) $(CAIRO_LIBS) \
-                                     $(RSVG_CFLAGS) $(RSVG_LIBS);\
-	fi
-
-pixbuf$(SHREXT): pixbuf.c $(GEGLHEADERS)
-	@if [ ! -z "$(RSVG_LIBS)" ]; then \
-	echo $@;\
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(RSVG_CFLAGS) $(RSVG_LIBS);\
-	fi
-
-exr-load$(SHREXT): exr-load.cpp $(GEGLHEADERS)
-	@if [ ! -z "$(OPENEXR_LIBS)" ]; then \
-	echo $@;\
-	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(OPENEXR_CFLAGS) $(OPENEXR_LIBS);\
-	fi
-
-save-pixbuf$(SHREXT): save-pixbuf.c $(GEGLHEADERS)
-	@[ ! -z "$(GTK_LIBS)" ] &&\
-	(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config gdk-pixbuf-2.0 --libs --cflags`)\
-	||true
-
-display$(SHREXT): display.c $(GEGLHEADERS)
-	@[ ! -z "$(SDL_LIBS)" ] &&\
-	(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(SDL_CFLAGS) $(SDL_LIBS)) \
-	|| true
-
-convert-format$(SHRECT): convert-format.c $(GEGLHEADERS)
-	@(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $a $< $(LDADD))