From e1d580ab0e135bc21bb347c80753042b65881ae0 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 8 Oct 2005 11:10:17 +0000 Subject: [PATCH] Makefile.am: remove include dir Original commit message from CVS: * Makefile.am: remove include dir * configure.ac: remove PLUGINS_BUILDDIR stuff * gst/gst.c: (init_post): reorder parsing of GST_PLUGIN_PATH and GST_PLUGIN_SYSTEM_PATH * idiottest.mak: remove, it was condescending and not needed --- Makefile.am | 12 +++----- configure.ac | 46 ++----------------------------- gst/gst.c | 67 +++++++++++++++++++++++---------------------- include/.gitignore | 7 ----- include/Makefile.am | 4 --- 5 files changed, 41 insertions(+), 95 deletions(-) delete mode 100644 include/.gitignore delete mode 100644 include/Makefile.am diff --git a/Makefile.am b/Makefile.am index eeac2274e7..b3d85b5e58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ aclocaldir = $(datadir)/aclocal aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 SUBDIRS = \ - include gst libs tools \ + gst libs tools \ $(SUBDIRS_CHECK) \ $(SUBDIRS_TESTS) \ $(SUBDIRS_EXAMPLES) \ @@ -43,14 +43,12 @@ SUBDIRS = \ # These are all the possible subdirs DIST_SUBDIRS = \ - include libs gst \ - tools \ + gst libs tools \ check \ tests testsuite \ examples \ docs \ - pkgconfig \ - po \ + pkgconfig po \ common win32 = $(shell cat $(top_srcdir)/win32/MANIFEST) @@ -61,12 +59,10 @@ EXTRA_DIST = \ gstreamer.spec gstreamer.spec.in gst-element-check.m4 \ configure.ac autogen.sh depcomp \ REQUIREMENTS ABOUT-NLS DOCBUILDING DEVEL RELEASE \ - $(win32) \ - idiottest.mak + $(win32) CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4 -include $(top_srcdir)/idiottest.mak include $(top_srcdir)/common/release.mak include $(top_srcdir)/common/po.mak diff --git a/configure.ac b/configure.ac index 0ba00c1721..0e3b9e79ef 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ fi dnl subsystems - can influence other decisions so needs to be high up dnl we need to do AM_CONDITIONAL them here for automake 1.6.x compatibility GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem]) -AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_DISABLE_GST_DEBUG" = "xyes") +AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_GST_DISABLE_DEBUG" = "xyes") GST_CHECK_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save]) AM_CONDITIONAL(GST_DISABLE_LOADSAVE, test "x$GST_DISABLE_LOADSAVE" = "xyes") GST_CHECK_SUBSYSTEM_DISABLE(PARSE,[command-line parser]) @@ -320,15 +320,6 @@ AC_HELP_STRING([--enable-fast-stack-trash],[use fast memory allocator (i586 or a esac], [USE_FAST_STACK_TRASH=yes]) dnl Default value -AC_ARG_ENABLE(plugin-builddir, -AC_HELP_STRING([--enable-plugin-builddir],[allow tests/demos to use non-installed plugins]), -[case "${enableval}" in - yes) PLUGINS_USE_BUILDDIR=yes ;; - no) PLUGINS_USE_BUILDDIR=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-plugin-builddir) ;; -esac], -[PLUGINS_USE_BUILDDIR=no]) dnl Default value - AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],[adds -pg to compiler commandline, for profiling]), [case "${enableval}" in @@ -339,13 +330,8 @@ esac], [USE_PROFILING=no]) dnl Default value dnl use a cache dir for storing element registry info. -dnl default to building registry in the source tree if we are enabling plugin build dir -if test "x$PLUGINS_USE_BUILDDIR" = "xyes"; then - GST_CACHE_DIR=`pwd` -else - dnl ${localstatedir} points to PREFIX/var - GST_CACHE_DIR=${localstatedir}/cache/gstreamer-$GST_MAJORMINOR -fi +GST_CACHE_DIR=${localstatedir}/cache/gstreamer-$GST_MAJORMINOR + AC_ARG_WITH(cachedir, AC_HELP_STRING([--with-cachedir],[specify path to use for plugin and command completion registries]), [case "${withval}" in @@ -482,10 +468,6 @@ AC_CHECK_LIB(dl, dladdr, [Defined if we have dladdr ()])) CFLAGS="$save_cflags" -if test "x$PLUGINS_USE_BUILDDIR" = xyes; then - AC_DEFINE(PLUGINS_USE_BUILDDIR, 1, [Define if plugins should be loaded from the build tree - only developers should use this]) -fi - if test "x$USE_DEBUG" = xyes; then GST_INT_CFLAGS="$GST_INT_CFLAGS -g" fi @@ -498,8 +480,6 @@ dnl These should be "USE_*" instead of "HAVE_*", but some packages expect dnl HAVE_ and it is likely to be easier to stick with the old name AM_CONDITIONAL(EXPERIMENTAL, test "x$EXPERIMENTAL" = "xyes") AM_CONDITIONAL(BROKEN, test "x$BROKEN" = "xyes") -AM_CONDITIONAL(PLUGINS_USE_BUILDDIR, test "x$PLUGINS_USE_BUILDDIR" = "xyes") - dnl ############################ dnl # Set up some more defines # @@ -548,11 +528,6 @@ AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory]) AC_SUBST(PLUGINS_DIR) AC_MSG_NOTICE([Using $PLUGINS_DIR as the plugin install location]) -dnl Set location of uninstalled plugin directory -PLUGINS_BUILDDIR=`pwd` -AC_DEFINE_UNQUOTED(PLUGINS_BUILDDIR, "$PLUGINS_BUILDDIR", [Define the uninstalled plugin directory]) -AC_SUBST(PLUGINS_BUILDDIR) - dnl LDFLAGS modifier defining exported symbols from built objects EXPORT_LDFLAGS="-export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*" @@ -618,20 +593,6 @@ dnl ################################################## infomessages= -if test "x$PLUGINS_USE_BUILDDIR" = xyes; then - infomessages="$infomessages -*** Warning: You have configured using the --enable-plugin-builddir option. - -This option is for development purposes only: binaries built with -it should be used with code in the build tree only. To build an -installable version, use ./configure without the --enable-plugin-builddir -option. Note that the autogen.sh script supplies the plugin builddir -option automatically -- run ./autogen.sh -- --disable-plugin-builddir to make -an installable build. - -" -fi - dnl ######################### dnl # Make the output files # dnl ######################### @@ -640,7 +601,6 @@ dnl libs/ext/Makefile dnl nothing there yet ! AC_OUTPUT( Makefile -include/Makefile gst/Makefile gst/gstconfig.h gst/gstversion.h diff --git a/gst/gst.c b/gst/gst.c index f43ead9b27..bf69d13daa 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -692,39 +692,8 @@ init_post (void) GST_DEBUG ("Reading registry cache"); gst_registry_xml_read_cache (default_registry, registry_file); - plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH"); - if (plugin_path == NULL) { - GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set"); -#ifdef PLUGINS_USE_BUILDDIR - /* location libgstelements.so */ - gst_registry_scan_path (default_registry, - PLUGINS_BUILDDIR "/gst/elements/.libs"); - gst_registry_scan_path (default_registry, - PLUGINS_BUILDDIR "/gst/indexers/.libs"); -#else - char *home_plugins; - - /* add the main (installed) library path */ - gst_registry_scan_path (default_registry, PLUGINS_DIR); - - home_plugins = g_build_filename (g_get_home_dir (), - ".gstreamer-0.9", "plugins", NULL); - gst_registry_scan_path (default_registry, home_plugins); - g_free (home_plugins); -#endif /* PLUGINS_USE_BUILDDIR */ - } else { - char **list; - int i; - - GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH set to %s", plugin_path); - /* FIXME this doesn't split paths correctly on windows */ - list = g_strsplit (plugin_path, ":", 0); - for (i = 0; list[i]; i++) { - gst_registry_scan_path (default_registry, list[i]); - } - g_strfreev (list); - } - + /* GST_PLUGIN_PATH specifies a list of directories to scan for + * additional plugins. These take precedence over the system plugins */ plugin_path = g_getenv ("GST_PLUGIN_PATH"); if (plugin_path) { char **list; @@ -741,12 +710,44 @@ init_post (void) GST_DEBUG ("GST_PLUGIN_PATH not set"); } + /* GST_PLUGIN_SYSTEM_PATH specifies a list of plugins that are always + * loaded by default. If not set, this defaults to the system-installed + * path, and the plugins installed in the user's home directory */ + plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH"); + if (plugin_path == NULL) { + char *home_plugins; + + GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set"); + + /* plugins in the user's home directory take precedence over + * system-installed ones */ + home_plugins = g_build_filename (g_get_home_dir (), + ".gstreamer-0.9", "plugins", NULL); + gst_registry_scan_path (default_registry, home_plugins); + g_free (home_plugins); + + /* add the main (installed) library path */ + gst_registry_scan_path (default_registry, PLUGINS_DIR); + } else { + char **list; + int i; + + GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH set to %s", plugin_path); + /* FIXME this doesn't split paths correctly on windows */ + list = g_strsplit (plugin_path, ":", 0); + for (i = 0; list[i]; i++) { + gst_registry_scan_path (default_registry, list[i]); + } + g_strfreev (list); + } + gst_registry_xml_write_cache (default_registry, registry_file); _gst_registry_remove_cache_plugins (default_registry); g_free (registry_file); } + #endif /* GST_DISABLE_REGISTRY */ /* if we need to preload plugins */ diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 08f5ed37d8..0000000000 --- a/include/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -Makefile.in -*.o -*.lo -*.la -.deps -.libs diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 7ac2f2c215..0000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ - -# This test needs to go here because this is the first makefile which the -# install target gets run in. -include $(top_srcdir)/idiottest.mak