vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 12 15:14:33 2017 +0200| [30d347b85c6373a9c1870ba479a0356aba8da6f7] | committer: Rémi Denis-Courmont
Remove Modules.am support > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=30d347b85c6373a9c1870ba479a0356aba8da6f7 --- bootstrap | 15 ------------ modules/Makefile.am | 2 +- modules/genmf | 68 ----------------------------------------------------- modules/list.sh | 7 +++--- 4 files changed, 4 insertions(+), 88 deletions(-) diff --git a/bootstrap b/bootstrap index ff4cfd2..e0904a4 100755 --- a/bootstrap +++ b/bootstrap @@ -57,21 +57,6 @@ EOF fi ### -### Generate the modules makefile, by parsing modules/**/Modules.am -### - -echo "generating modules/**/Makefile.am" -for d in modules/*/*/Modules.am; do - d="${d#modules/}" - d="${d%/Modules.am}" - ${CONFIG_SHELL-sh} modules/genmf "$d" - printf "." -done || true -printf "\n" - -set -x - -### ### classic bootstrap stuff ### diff --git a/modules/Makefile.am b/modules/Makefile.am index 57dc49c..5e9e079 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -15,7 +15,7 @@ endif TESTS = -dist_noinst_SCRIPTS = genmf list.sh module.rc.in +dist_noinst_SCRIPTS = list.sh module.rc.in dist_noinst_DATA = MODULES_LIST EXTRA_LTLIBRARIES = diff --git a/modules/genmf b/modules/genmf deleted file mode 100755 index be97990..0000000 --- a/modules/genmf +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh - -## genmf file for the VLC media player -## -## Copyright (C) 2005-2007 the VideoLAN team -## -## Authors: Sam Hocevar <[email protected]> -## Rémi Denis-Courmont <rem # videolan # org> - -cd $(dirname "$0")/.. || exit 1 - -while test "$1" -do - dir="$1" - modf="modules/${dir}/Modules.am" - if test ! -f "$modf"; then - echo "$modf does not exist!" >&2 - exit 1 - fi - makf="modules/${dir}/Makefile.am" - basedir="`echo "${dir}" | cut -f1 -d/`" - mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | sort | uniq | xargs`" - plugins="`sed -n -e 's/^.*lib\([^ ]*\)_plugin\.la.*/\1/p' < "${modf}" | sort | uniq | xargs`" - rm -f "${makf}" && cat > "${makf}" << EOF -# ${makf} automatically generated from ${modf} by $0 -# DO NOT EDIT THIS FILE DIRECTLY! See Modules.am instead. - -${basedir}dir = \$(pluginsdir)/${basedir} -${basedir}_LTLIBRARIES = -EXTRA_LTLIBRARIES = - -EXTRA_DIST = Modules.am - -include \$(top_srcdir)/modules/common.am -include \$(srcdir)/Modules.am - -if MAINTAINER_MODE -\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/modules/genmf - \$(AM_V_GEN)cd \\\$(top_srcdir) && \\\$(SHELL) modules/genmf ${dir} -endif -EOF - for mod in $mods - do - cat >> "${makf}" << EOF - -lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod}) -lib${mod}_plugin_la_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod}) \ - -DMODULE_NAME_IS_${mod} -lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS) \$(CFLAGS_${mod}) -lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS) \$(CXXFLAGS_${mod}) -lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS) \$(OBJCFLAGS_${mod}) -lib${mod}_plugin_la_LIBADD = \$(LIBS_${mod}) -lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) -rpath '\$(${basedir}dir)' \$(LDFLAGS_${mod}) -EOF - case " ${plugins} " in - *\ ${mod}\ *) - ;; - *) - cat >> "${makf}" << EOF -EXTRA_LTLIBRARIES += lib${mod}_plugin.la -${basedir}_LTLIBRARIES += \$(LTLIB${mod}) -EOF - ;; - esac - done - - shift -done diff --git a/modules/list.sh b/modules/list.sh index d5c0e8e..2f9fc38 100755 --- a/modules/list.sh +++ b/modules/list.sh @@ -17,10 +17,9 @@ echo "------------------------------------" i=0 -for modfile in `find . -name "Modules.am" -o -name "Makefile.am"` +for modfile in `find . -name "Makefile.am"` do - for module in `awk '/^SOURCES_/{sub(/SOURCES_/,"",$1); print $1}' "$modfile"`\ - `awk '/^lib.*_plugin_la_SOURCES/{sub(/lib/,""); sub(/_plugin_la_SOURCES/,"",$1); print $1}' "$modfile"` + for module in `awk '/^lib.*_plugin_la_SOURCES/{sub(/lib/,""); sub(/_plugin_la_SOURCES/,"",$1); print $1}' "$modfile"` do echo $module >> $TEMPFILE if ! grep -q " \* $module:" $LISTFILE @@ -66,6 +65,6 @@ grep " \* " $LISTFILE | LC_COLLATE=C LC_CTYPE=C sort -c && echo "OK" echo "" -echo "`sort -u $TEMPFILE | wc -l` modules listed in Modules.am files" +echo "`sort -u $TEMPFILE | wc -l` modules listed in Makefiles" rm -f $TEMPFILE _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
