diff options
| author | Julien Moutte <julien@moutte.net> | 2006-02-24 22:49:29 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2006-02-24 22:49:29 +0000 |
| commit | bac83b472dce97048187c049bd12ef9f30777773 (patch) | |
| tree | 790c8ced2499c406f43dbb14af962d293e5d21ff | |
| parent | 73a6055bdf16990ff6abaed612b8527db439a9f8 (diff) | |
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."
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 5 |
3 files changed, 18 insertions, 7 deletions
@@ -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 bfc10ccf..8f764588 100644 --- 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 8d5abb03..0f6a6c9a 100644 --- 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) |