[gegl-gtk] Build: Fix ordering in linking of examples



commit c00ae33570c4ec759c27dea51d9688db032e0144
Author: Jon Nordby <jononor gmail com>
Date:   Sun Nov 20 16:19:00 2011 +0100

    Build: Fix ordering in linking of examples

 examples/c/Makefile.am |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index b92ac59..856c976 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -13,17 +13,18 @@ gegl_lt_ccld_v_0 = @echo "  CCLD   " $@;
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gegl-gtk
 
-AM_CFLAGS = $(GEGL_CFLAGS) $(GTK_CFLAGS)
+CFLAGS = $(GTK_CFLAGS) $(GEGL_CFLAGS)
 
-AM_LDFLAGS =  \
-	$(top_builddir)/gegl-gtk/libgegl-gtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.la \
-	$(GEGL_LIBS) $(GTK_LIBS)
+libgeglgtk = $(top_builddir)/gegl-gtk/libgegl-gtk$(GEGL_GTK_GTK_VERSION)-$(GEGL_GTK_API_VERSION).la
+
+LIBS =  \
+	$(GTK_LIBS) $(GEGL_LIBS) $(libgeglgtk)
 
 all-local: $(bins)
 
 %: %.c $(GEGLHEADERS)
-	$(gegl_lt_cc_v) $(LIBTOOL) --quiet --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $< 
-	$(gegl_lt_ccld_v) $(LIBTOOL) --quiet --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ $  lo $(LIBS)
+	$(gegl_lt_cc_v) $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(DEFS) -I. -I$(top_builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $< 
+	$(gegl_lt_ccld_v) $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) $(CFLAGS) -o $@ $  lo $(LIBS)
 
 clean-local:
 	rm -f *.lo $(bins)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]