Benjamin Otte
2007-Apr-22 08:54 UTC
[Swfdec] 2 commits - libswfdec-gtk/Makefile.am libswfdec/jpeg libswfdec/Makefile.am
libswfdec-gtk/Makefile.am | 5 ++++-
libswfdec/Makefile.am | 2 +-
libswfdec/jpeg/Makefile.am | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
diff-tree 8977e39ad9aac26c936fb40acb2080d0101b75c3 (from
51dd584d256a61f8c60e9349bd92e5113e646c4d)
Author: Benjamin Otte <otte@gnome.org>
Date: Sun Apr 22 17:55:54 2007 +0200
fix includes for make distcheck
diff --git a/libswfdec-gtk/Makefile.am b/libswfdec-gtk/Makefile.am
index b2dfb72..84a2e8e 100644
--- a/libswfdec-gtk/Makefile.am
+++ b/libswfdec-gtk/Makefile.am
@@ -10,6 +10,8 @@ CLEANFILES = swfdec_playback.c
lib_LTLIBRARIES = libswfdec-gtk-@SWFDEC_MAJORMINOR@.la
+js_cflags = -I$(srcdir)/js/ -I$(top_builddir)/libswfdec/js -DXP_UNIX -DDEBUG
+
libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_SOURCES = \
swfdec_playback.c \
swfdec_source.c \
@@ -22,7 +24,8 @@ noinst_HEADERS = \
swfdec_source.h
libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_CFLAGS = \
- $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) $(AUDIO_CFLAGS)
$(GNOMEVFS_CFLAGS) \
+ -I$(top_srcdir) $(js_cflags) $(GLOBAL_CFLAGS) $(SWFDEC_CFLAGS) $(GTK_CFLAGS) \
+ $(AUDIO_CFLAGS) $(GNOMEVFS_CFLAGS) \
-DG_LOG_DOMAIN=\"Swfdec-Gtk\" -DXP_UNIX
libswfdec_gtk_@SWFDEC_MAJORMINOR@_la_LDFLAGS = \
-version-info $(SWFDEC_LIBVERSION) \
diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am
index 54710bf..b3e81ac 100644
--- a/libswfdec/Makefile.am
+++ b/libswfdec/Makefile.am
@@ -91,7 +91,7 @@ libswfdec_@SWFDEC_MAJORMINOR@_la_SOURCES
libswfdec_@SWFDEC_MAJORMINOR@_la_CFLAGS = \
$(GLOBAL_CFLAGS) $(CAIRO_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \
- -I$(srcdir)/jpeg/ $(js_cflags) $(LIBOIL_CFLAGS) \
+ -I$(top_srcdir) -I$(srcdir)/jpeg/ $(js_cflags) $(LIBOIL_CFLAGS) \
$(GST_CFLAGS) $(FFMPEG_CFLAGS) $(MAD_CFLAGS) \
-DG_LOG_DOMAIN=\"Swfdec\"
libswfdec_@SWFDEC_MAJORMINOR@_la_LDFLAGS = \
diff-tree 51dd584d256a61f8c60e9349bd92e5113e646c4d (from
3a1839889ef8a1d068b0ed6db343b41fb872c51e)
Author: Benjamin Otte <otte@gnome.org>
Date: Sun Apr 22 17:55:43 2007 +0200
we wanna ship jpeg_internal.h
diff --git a/libswfdec/jpeg/Makefile.am b/libswfdec/jpeg/Makefile.am
index 7dd3152..a46ab34 100644
--- a/libswfdec/jpeg/Makefile.am
+++ b/libswfdec/jpeg/Makefile.am
@@ -13,6 +13,7 @@ noinst_HEADERS = \
jpeg.h \
jpeg_bits.h \
jpeg_huffman.h \
+ jpeg_internal.h \
jpeg_rgb_decoder.h
libjpeg_la_CFLAGS = $(GLOBAL_CFLAGS) $(GLIB_CFLAGS) $(LIBOIL_CFLAGS)
-I$(srcdir)/..