From c81314f924424c0fb603bd4c89402a004058b44e Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 2 Jan 2002 12:23:26 +0000 Subject: [PATCH] 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) --- configure.ac | 4 ++-- gst/Makefile.am | 4 ++-- gst/gstplugin.c | 2 +- tests/old/testsuite/Makefile.am | 2 +- tests/old/testsuite/capsnego/Makefile.am | 4 ++-- tests/old/testsuite/plugin/Makefile.am | 4 ++++ testsuite/Makefile.am | 2 +- testsuite/capsnego/Makefile.am | 4 ++-- testsuite/plugin/Makefile.am | 4 ++++ 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index e63cbe7..2ed85b1 100644 --- a/configure.ac +++ b/configure.ac @@ -663,13 +663,13 @@ AC_SUBST(PLUGINS_BUILDDIR) dnl Private vars for libgst only 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_CFLAGS) dnl Vars for everyone else 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_CFLAGS) diff --git a/gst/Makefile.am b/gst/Makefile.am index b12b325..70c30b8 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -203,7 +203,7 @@ noinst_HEADERS = \ gstpropsprivate.h libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ - $(LIBGST_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) \ + $(LIBGST_CFLAGS) \ -D_GNU_SOURCE \ -DG_LOG_DOMAIN=g_log_domain_gstreamer \ -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ @@ -213,7 +213,7 @@ libgst_la_CFLAGS = -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \ -Wnested-externs \ -Winline -Wno-unused -libgst_la_LIBADD = $(XML_LIBS) $(GLIB_LIBS) +libgst_la_LIBADD = $(LIBGST_LIBS) libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION) diff --git a/gst/gstplugin.c b/gst/gstplugin.c index e2798e3..0578abb 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -98,7 +98,7 @@ _gst_plugin_initialize (void) !plugin_times_older_than(get_time(GST_CONFIG_DIR"/reg.xml"))) { 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_load_all (); /* gst_plugin_unload_all (); */ diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am index 0b959568..1cbcbb1 100644 --- a/tests/old/testsuite/Makefile.am +++ b/tests/old/testsuite/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = $(testprogs) # we have nothing but apps here, we can do this safely LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +CFLAGS = $(GST_CFLAGS) # FIXME : refcounting threadds DIST_SUBDIRS = capsnego plugin bytestream cleanup diff --git a/tests/old/testsuite/capsnego/Makefile.am b/tests/old/testsuite/capsnego/Makefile.am index 032061d..f12ec08 100644 --- a/tests/old/testsuite/capsnego/Makefile.am +++ b/tests/old/testsuite/capsnego/Makefile.am @@ -1,4 +1,4 @@ -testprogs = converter enum # capsnego converter2 +testprogs = converter # enum capsnego converter2 TESTS = $(testprogs) @@ -6,4 +6,4 @@ check_PROGRAMS = $(testprogs) # we have nothing but apps here, we can do this safely LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +CFLAGS = $(GST_CFLAGS) diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am index 2f652d8..9b1d4c9 100644 --- a/tests/old/testsuite/plugin/Makefile.am +++ b/tests/old/testsuite/plugin/Makefile.am @@ -18,3 +18,7 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c TESTS = $(testprogs) check_PROGRAMS = $(testprogs) + +LIBS = $(GST_LIBS) +CFLAGS = $(GST_CFLAGS) + diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 0b959568..1cbcbb1 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = $(testprogs) # we have nothing but apps here, we can do this safely LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +CFLAGS = $(GST_CFLAGS) # FIXME : refcounting threadds DIST_SUBDIRS = capsnego plugin bytestream cleanup diff --git a/testsuite/capsnego/Makefile.am b/testsuite/capsnego/Makefile.am index 032061d..f12ec08 100644 --- a/testsuite/capsnego/Makefile.am +++ b/testsuite/capsnego/Makefile.am @@ -1,4 +1,4 @@ -testprogs = converter enum # capsnego converter2 +testprogs = converter # enum capsnego converter2 TESTS = $(testprogs) @@ -6,4 +6,4 @@ check_PROGRAMS = $(testprogs) # we have nothing but apps here, we can do this safely LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +CFLAGS = $(GST_CFLAGS) diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am index 2f652d8..9b1d4c9 100644 --- a/testsuite/plugin/Makefile.am +++ b/testsuite/plugin/Makefile.am @@ -18,3 +18,7 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c TESTS = $(testprogs) check_PROGRAMS = $(testprogs) + +LIBS = $(GST_LIBS) +CFLAGS = $(GST_CFLAGS) + -- 2.7.4