diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-01-07 15:26:57 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-01-07 15:49:53 +0000 |
| commit | 17e1d8d20afa25e3f03264f70491ab2798ae287b (patch) | |
| tree | 0e368fe33a9ca66acff9142b35d40f5e2271952b | |
| parent | 658388c57b931837881b74e7bfb78685b461aaed (diff) | |
tag: fix up disting of lang-tables.c more correctly
lang-tables.c is included by lang.c and not really a proper source
file that should be compiled into its own object, so rename it to
lang-tables.dat and put it into EXTRA_DIST instead to ensure it
gets disted.
| -rw-r--r-- | gst-libs/gst/tag/Makefile.am | 5 | ||||
| -rw-r--r-- | gst-libs/gst/tag/lang-tables.dat (renamed from gst-libs/gst/tag/lang-tables.c) | 0 | ||||
| -rw-r--r-- | gst-libs/gst/tag/lang.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index cef03c80..15888ed6 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -6,11 +6,14 @@ libgsttaginclude_HEADERS = \ lib_LTLIBRARIES = libgsttag-@GST_MAJORMINOR@.la -libgsttag_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gstid3tag.c lang.c tags.c gsttagdemux.c lang-tables.c +libgsttag_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gstid3tag.c lang.c tags.c gsttagdemux.c libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgsttag_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +# lang-tables.dat contains generated static data and is included by lang.c +EXTRA_DIST = lang-tables.dat + noinst_HEADERS = gsttageditingprivate.h if HAVE_INTROSPECTION diff --git a/gst-libs/gst/tag/lang-tables.c b/gst-libs/gst/tag/lang-tables.dat index 5e40aafd..5e40aafd 100644 --- a/gst-libs/gst/tag/lang-tables.c +++ b/gst-libs/gst/tag/lang-tables.dat diff --git a/gst-libs/gst/tag/lang.c b/gst-libs/gst/tag/lang.c index 2a8cb6fd..dc212eff 100644 --- a/gst-libs/gst/tag/lang.c +++ b/gst-libs/gst/tag/lang.c @@ -47,7 +47,7 @@ #include <string.h> #include <stdlib.h> -#include "lang-tables.c" +#include "lang-tables.dat" /* FIXME: remove once we depend on GLib >= 2.22 */ #if !GLIB_CHECK_VERSION (2, 22, 0) |