ext/Makefile.am: Disable annodex for now until we figure out how to make it build.

Original commit message from CVS:
2006-02-24  Julien MOUTTE  <julien@moutte.net>

* ext/Makefile.am: Disable annodex for now until we figure out
how to make it build.
* ext/gdk_pixbuf/Makefile.am: Note for Thomas :
Add a rule to your checklist : "please try to at least build
what you are going to commit into -good, or if you are too lazy
to do that, please check that the buildbots are not crying because
of your commit."

diff --git a/ChangeLog b/ChangeLog
index 83b55a4..73f8ab9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-24  Julien MOUTTE  <julien@moutte.net>
+
+       * ext/Makefile.am: Disable annodex for now until we figure out
+       how to make it build.
+       * ext/gdk_pixbuf/Makefile.am: Note for Thomas :
+       Add a rule to your checklist : "please try to at least build 
+       what you are going to commit into -good, or if you are too lazy
+       to do that, please check that the buildbots are not crying because
+       of your commit."
+
 2006-02-24  Edgard Lima  <edgard.lima@indt.org.br>
 
        * configure.ac:

diff --git a/ext/Makefile.am b/ext/Makefile.am
index bfc10cc..8f76458 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -4,11 +4,11 @@ else
 AALIB_DIR =
 endif
 
-if USE_ANNODEX
-ANNODEX_DIR = annodex
-else
-ANNODEX_DIR =
-endif
+# if USE_ANNODEX
+# ANNODEX_DIR = annodex
+# else
+# ANNODEX_DIR =
+# endif
 
 if USE_CAIRO
 CAIRO_DIR = cairo

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index 8d5abb0..0f6a6c9 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -1,8 +1,9 @@
 plugin_LTLIBRARIES = libgstgdkpixbuf.la
 
 libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c pixbufscale.c
-libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS)
-libgstgdkpixbuf_la_LIBADD = $(GTK_LIBS)  $(GST_BASE_LIBS)
+libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS) \
+                           $(GST_PLUGINS_BASE_CFLAGS)
+libgstgdkpixbuf_la_LIBADD = $(GTK_LIBS)  $(GST_LIBS) $(GST_BASE_LIBS)
 libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)