fixes to make distcheck work changed registry out of date to warning to allow tests to continue regardless (any bette...

Original commit message from CVS:
fixes to make distcheck work
changed registry out of date to warning to allow tests to continue regardless (any better suggestions much appreciated)
This commit is contained in:
Thomas Vander Stichele 2002-01-02 12:23:26 +00:00
parent f1827a5697
commit c81314f924
9 changed files with 19 additions and 11 deletions

View file

@ -663,13 +663,13 @@ AC_SUBST(PLUGINS_BUILDDIR)
dnl Private vars for libgst only dnl Private vars for libgst only
LIBGST_LIBS="$GST_LIBS $XML_LIBS $GLIB_LIBS" LIBGST_LIBS="$GST_LIBS $XML_LIBS $GLIB_LIBS"
LIBGST_CFLAGS="$GST_CFLAGS $XML_CFLAGS $GLIB_CFLAGS" LIBGST_CFLAGS="$GST_CFLAGS $XML_CFLAGS $GLIB_CFLAGS -I\$(top_srcdir)"
AC_SUBST(LIBGST_LIBS) AC_SUBST(LIBGST_LIBS)
AC_SUBST(LIBGST_CFLAGS) AC_SUBST(LIBGST_CFLAGS)
dnl Vars for everyone else dnl Vars for everyone else
GST_LIBS="\$(top_builddir)/gst/libgst.la $LIBGST_LIBS" GST_LIBS="\$(top_builddir)/gst/libgst.la $LIBGST_LIBS"
GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/libs -I\$(top_srcdir)/include $LIBGST_CFLAGS" GST_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir)/include $LIBGST_CFLAGS"
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)

View file

@ -203,7 +203,7 @@ noinst_HEADERS = \
gstpropsprivate.h gstpropsprivate.h
libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
$(LIBGST_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) \ $(LIBGST_CFLAGS) \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \ -DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
@ -213,7 +213,7 @@ libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
-Wnested-externs \ -Wnested-externs \
-Winline -Wno-unused -Winline -Wno-unused
libgst_la_LIBADD = $(XML_LIBS) $(GLIB_LIBS) libgst_la_LIBADD = $(LIBGST_LIBS)
libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION) libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION)

View file

@ -98,7 +98,7 @@ _gst_plugin_initialize (void)
!plugin_times_older_than(get_time(GST_CONFIG_DIR"/reg.xml"))) !plugin_times_older_than(get_time(GST_CONFIG_DIR"/reg.xml")))
{ {
if (_gst_warn_old_registry) if (_gst_warn_old_registry)
g_error ("gstplugin: registry needs rebuild: run gstreamer-register\n"); g_warning ("gstplugin: registry needs rebuild: run gstreamer-register\n");
_gst_plugin_paths = g_list_concat (_gst_plugin_paths, gst_plugin_default_paths); _gst_plugin_paths = g_list_concat (_gst_plugin_paths, gst_plugin_default_paths);
gst_plugin_load_all (); gst_plugin_load_all ();
/* gst_plugin_unload_all (); */ /* gst_plugin_unload_all (); */

View file

@ -9,7 +9,7 @@ check_PROGRAMS = $(testprogs)
# we have nothing but apps here, we can do this safely # we have nothing but apps here, we can do this safely
LIBS = $(GST_LIBS) LIBS = $(GST_LIBS)
CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) CFLAGS = $(GST_CFLAGS)
# FIXME : refcounting threadds # FIXME : refcounting threadds
DIST_SUBDIRS = capsnego plugin bytestream cleanup DIST_SUBDIRS = capsnego plugin bytestream cleanup

View file

@ -1,4 +1,4 @@
testprogs = converter enum # capsnego converter2 testprogs = converter # enum capsnego converter2
TESTS = $(testprogs) TESTS = $(testprogs)
@ -6,4 +6,4 @@ check_PROGRAMS = $(testprogs)
# we have nothing but apps here, we can do this safely # we have nothing but apps here, we can do this safely
LIBS = $(GST_LIBS) LIBS = $(GST_LIBS)
CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) CFLAGS = $(GST_CFLAGS)

View file

@ -18,3 +18,7 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
TESTS = $(testprogs) TESTS = $(testprogs)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)
LIBS = $(GST_LIBS)
CFLAGS = $(GST_CFLAGS)

View file

@ -9,7 +9,7 @@ check_PROGRAMS = $(testprogs)
# we have nothing but apps here, we can do this safely # we have nothing but apps here, we can do this safely
LIBS = $(GST_LIBS) LIBS = $(GST_LIBS)
CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) CFLAGS = $(GST_CFLAGS)
# FIXME : refcounting threadds # FIXME : refcounting threadds
DIST_SUBDIRS = capsnego plugin bytestream cleanup DIST_SUBDIRS = capsnego plugin bytestream cleanup

View file

@ -1,4 +1,4 @@
testprogs = converter enum # capsnego converter2 testprogs = converter # enum capsnego converter2
TESTS = $(testprogs) TESTS = $(testprogs)
@ -6,4 +6,4 @@ check_PROGRAMS = $(testprogs)
# we have nothing but apps here, we can do this safely # we have nothing but apps here, we can do this safely
LIBS = $(GST_LIBS) LIBS = $(GST_LIBS)
CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) CFLAGS = $(GST_CFLAGS)

View file

@ -18,3 +18,7 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
TESTS = $(testprogs) TESTS = $(testprogs)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)
LIBS = $(GST_LIBS)
CFLAGS = $(GST_CFLAGS)