gegl r2076 - in trunk: . operations operations/affine operations/io operations/render operations/workshop

[ok svn gnome org]

Author: ok
Date: Wed Feb 20 23:48:49 2008
New Revision: 2076
URL: http://svn.gnome.org/viewvc/gegl?rev=2076&view=rev

Log:
Modified makefiles to use libtool instead of directly driving CC.
* configure.ac: changed darwin shrext to .so.
* operations/Makefile-operations.am:
* operations/affine/Makefile.am:
* operations/io/Makefile.am:
* operations/render/Makefile.am:
* operations/workshop/Makefile.am:


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/operations/Makefile-operations.am
   trunk/operations/affine/Makefile.am
   trunk/operations/io/Makefile.am
   trunk/operations/render/Makefile.am
   trunk/operations/workshop/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 20 23:48:49 2008
@@ -239,7 +239,7 @@
 AC_MSG_CHECKING([for some Win32 platform])
 case "$target_or_host" in 
   *-*-darwin*)                 # darwin
-    shrext=.dylib
+    shrext=.so
     dynamiclib=-dynamiclib
     ;;
   *-*-mingw* | *-*-cygwin*)    # windows

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Wed Feb 20 23:48:49 2008
@@ -1,9 +1,9 @@
-if OS_WIN32
-no_undefined = -no-undefined
-libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION).dll.a
-else
-libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION)$(SHREXT)
-endif
+#if OS_WIN32
+#no_undefined = -no-undefined
+#libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION).dll.a
+#else
+#libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION)$(SHREXT)
+#endif
 
 CFILES          = $(wildcard $(srcdir)/*.c)
 SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=$(SHREXT)))
@@ -23,12 +23,14 @@
            -I$(top_srcdir)/gegl/property-types   \
            -I$(top_srcdir)/gegl/module           \
            -I. -fPIC
-LDFLAGS += $(DYNAMICLIB) $(no_undefined)
+LDFLAGS += $(DYNAMICLIB) $(no_undefined) -module -avoid-version
 
-LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(libgegldlla)
+LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 
 %$(SHREXT): %.c $(GEGLHEADERS)
-	@echo $@; $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
+
+
 
 clean-local:
 	rm -f *$(SHREXT) $(OFILES)

Modified: trunk/operations/affine/Makefile.am
==============================================================================
--- trunk/operations/affine/Makefile.am	(original)
+++ trunk/operations/affine/Makefile.am	Wed Feb 20 23:48:49 2008
@@ -5,9 +5,8 @@
 SOBJS          = affine$(SHREXT)
 INSTALLED_ITEMS = $(ext_dir)/$(SOBJS)
 
-
 %.o: %.c chant.h module.h matrix.h $(GEGLHEADERS)
-	@echo $@;$(CC) $(CFLAGS) -c $< 
+	$(CC) $(CFLAGS) -c $< 
 
 affine$(SHREXT): $(OFILES)
-	@echo $@;$(CC) $(OFILES) -o affine$(SHREXT) $(LDFLAGS) $(LDADD)
+	$(LIBTOOL) --mode=link $(CC) $(OFILES) -o affine$(SHREXT) $(LDFLAGS) $(LDADD)

Modified: trunk/operations/io/Makefile.am
==============================================================================
--- trunk/operations/io/Makefile.am	(original)
+++ trunk/operations/io/Makefile.am	Wed Feb 20 23:48:49 2008
@@ -9,27 +9,28 @@
 
 ff-load$(SHREXT): ff-load.c $(GEGLHEADERS)
 	@if [ ! -z "$(AVCODEC_LIBS)" ]; then \
-	echo $@;\
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
+	$(LIBTOOL) --mode=link $(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 $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(LIBJPEG);\
 	fi
 
 png-load$(SHREXT): png-load.c $(GEGLHEADERS)
-	@echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(PNG_CFLAGS) $(PNG_LIBS)
+	$(LIBTOOL) --mode=link \
+	$(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)
+	$(LIBTOOL) --mode=link \
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(PNG_CFLAGS) $(PNG_LIBS)
 
 svg-load$(SHREXT): svg-load.c $(GEGLHEADERS)
 	@if [ ! -z "$(RSVG_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
                                      $(CAIRO_CFLAGS) $(CAIRO_LIBS) \
                                      $(RSVG_CFLAGS) $(RSVG_LIBS);\
@@ -37,25 +38,25 @@
 
 pixbuf$(SHREXT): pixbuf.c $(GEGLHEADERS)
 	@if [ ! -z "$(RSVG_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(RSVG_CFLAGS) $(RSVG_LIBS);\
 	fi
 
 exr-load$(SHREXT): exr-load.cpp $(GEGLHEADERS)
 	@if [ ! -z "$(OPENEXR_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(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`)\
+	($(LIBTOOL) --mode=link $(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)) \
+	($(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(SDL_CFLAGS) $(SDL_LIBS)) \
 	|| true
 
 convert-format$(SHRECT): convert-format.c $(GEGLHEADERS)
-	@(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $a $< $(LDADD))
+	@($(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $a $< $(LDADD))

Modified: trunk/operations/render/Makefile.am
==============================================================================
--- trunk/operations/render/Makefile.am	(original)
+++ trunk/operations/render/Makefile.am	Wed Feb 20 23:48:49 2008
@@ -4,7 +4,7 @@
 
 text$(SHREXT): text.c $(GEGLHEADERS)
 	@if [ ! -z "$(PANGO_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
               $(CAIRO_CFLAGS) $(CAIRO_LIBS) \
               $(PANGO_CFLAGS) $(PANGO_LIBS) \
@@ -14,7 +14,7 @@
 
 stroke$(SHREXT): stroke.c $(GEGLHEADERS)
 	@if [ ! -z "$(PANGO_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
               $(CAIRO_CFLAGS) $(CAIRO_LIBS) \
               $(PANGO_CFLAGS) $(PANGO_LIBS) \

Modified: trunk/operations/workshop/Makefile.am
==============================================================================
--- trunk/operations/workshop/Makefile.am	(original)
+++ trunk/operations/workshop/Makefile.am	Wed Feb 20 23:48:49 2008
@@ -6,29 +6,30 @@
 	-$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
 
 stress$(SHREXT): stress.c $(GEGLHEADERS) envelopes.h
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
 c2g$(SHREXT): c2g.c $(GEGLHEADERS) envelopes.h
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
 min-envelope$(SHREXT): min-envelope.c $(GEGLHEADERS) envelopes.h
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
 max-envelope$(SHREXT): max-envelope.c $(GEGLHEADERS) envelopes.h
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
 
 lum-profile$(SHREXT): lum-profile.c $(GEGLHEADERS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(CAIRO_CFLAGS) $(CAIRO_LIBS)
 
 gluas$(SHREXT): gluas.c $(GEGLHEADERS)
 	@if [ ! -z "$(LUA_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(LUA_CFLAGS) $(LUA_LIBS);\
 	fi
 
 gst$(SHREXT): gst.c $(GEGLHEADERS)
+	$(LIBTOOL) --mode=link \
 	-$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config gstreamer-0.10 --libs --cflags`
 
 ff-save$(SHREXT): ff-save.c $(GEGLHEADERS)
 	@if [ -n "$(AVCODEC_LIBS)" ] && [ -n "$(AVFORMAT_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
 		$(AVCODEC_CFLAGS) $(AVCODEC_LIBS)    \
 		$(AVFORMAT_CFLAGS) $(AVFORMAT_LIBS); \
@@ -36,12 +37,12 @@
 
 gtk-display$(SHREXT): gtk-display.c $(GEGLHEADERS)
 	@[ ! -z "$(GTK_LIBS)" ] &&\
-	(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(GTK_CFLAGS) $(GTK_LIBS))\
+	($(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(GTK_CFLAGS) $(GTK_LIBS))\
 	||true
 
 stroke$(SHREXT): stroke.c $(GEGLHEADERS)
 	if [ ! -z "$(PANGO_LIBS)" ]; then \
-	echo $@;\
+	$(LIBTOOL) --mode=link \
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
               $(CAIRO_CFLAGS) $(CAIRO_LIBS) \
               $(PANGO_CFLAGS) $(PANGO_LIBS) \