From b5e6f4f1f9c5038050387898581884fe73b7dc0f Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 03 Jul 2009 13:04:12 +0000 Subject: Bug 587684 – building gegl fails in operations/workshop/external Add $(GLIB_CFLAGS), $(BABL_CFLAGS) where missing --- diff --git a/operations/workshop/external/Makefile.am b/operations/workshop/external/Makefile.am index 5a3b85b..075427a 100644 --- a/operations/workshop/external/Makefile.am +++ b/operations/workshop/external/Makefile.am @@ -7,7 +7,7 @@ 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) $(BABL_CFLAGS) +line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS) ops += line_profile.la endif @@ -15,21 +15,21 @@ 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) $(BABL_CFLAGS) +gtk_display_la_CFLAGS = $(GTK_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS) endif if HAVE_AVFORMAT ops += ff_save.la ff_save_la_SOURCES = ff-save.c ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS) -lswscale -ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) +ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(GLIB_CFLAGS) endif if HAVE_LUA ops += gluas.la gluas_la_SOURCES = gluas.c gluas_la_LIBADD = $(op_libs) $(LUA_LIBS) -gluas_la_CFLAGS = $(LUA_CFLAGS) +gluas_la_CFLAGS = $(LUA_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS) endif opdir = $(libdir)/gegl-@GEGL_API_VERSION@ -- cgit v0.8.2