#! /bin/sh
## bootstrap file for the VLC media player
-## $Id: bootstrap,v 1.66 2003/07/07 16:53:48 sam Exp $
+## $Id: bootstrap,v 1.67 2003/07/08 13:09:30 sam Exp $
##
## Authors: Sam Hocevar <sam@zoy.org>
EOF
modules=""
-count=0
rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF
# Autogenerated by bootstrap - DO NOT EDIT
do
printf "."
mf="modules/${dir}/Modules.am"
- basedir="`echo ${dir} | cut -f1 -d/`"
+ basedir="${dir%%\/*}"
# automake will not recurse for make dist if we don't define SUBDIRS = .
subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
- #parent=`echo ${dir} | sed -e 's@[^/]*@..@g'`
- #echo " modules/${dir}/Makefile" >> m4/private.m4-tmp3
rm -f modules/${dir}/Makefile.am && cat > modules/${dir}/Makefile.am << EOF
# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead
clean: clean-local
clean-local:
- rm -f *.a *.so *.dll *.sl *.dylib
+ -rm -f *.a *.so *.dll *.sl *.dylib
EOF
for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
do
- count="`expr ${count} + 1`"
if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then
PRIVATE='#'; else
PRIVATE=''; fi
EOF
if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
clean-${mod}:
- rm -f \$(nodist_SOURCES_${mod})
+ -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
EOF
fi
endif
if UNTRUE
-L${count}p = lib${mod}_plugin.a
-D${count}p = lib${mod}_plugin\$(LIBEXT)
-L${count}b = lib${mod}.a
-L${count}pic = lib${mod}_pic.a
+L${mod}-p = lib${mod}_plugin.a
+D${mod}-p = lib${mod}_plugin\$(LIBEXT)
+L${mod}-b = lib${mod}.a
+L${mod}-pic = lib${mod}_pic.a
EOF
if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-B${count} = \$(nodist_SOURCES_${mod})
+B${mod} = \$(nodist_SOURCES_${mod})
EOF
fi
cat >> modules/${dir}/Makefile.am << EOF
EOF
if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
-${PRIVATE}BUILT_SOURCES += \$(B${count})
+${PRIVATE}BUILT_SOURCES += \$(B${mod})
EOF
fi
cat >> modules/${dir}/Makefile.am << EOF
lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-libvlc_LIBRARIES += \$(L${count}b) \$(L${count}pic)
-lib${mod}_DATA = \$(D${count}p)
+libvlc_LIBRARIES += \$(L${mod}-b) \$(L${mod}-pic)
+lib${mod}_DATA = \$(D${mod}-p)
lib${mod}dir = \$(libdir)/vlc/${topdir}
-${PRIVATE}noinst_LIBRARIES += \$(L${count}p)
+${PRIVATE}noinst_LIBRARIES += \$(L${mod}-p)
${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS)
${PRIVATE} @case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\
${PRIVATE} c++) echo \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
#! /bin/sh
## toolbox for the VLC media player
-## $Id: toolbox,v 1.38 2003/07/05 14:47:53 sam Exp $
+## $Id: toolbox,v 1.39 2003/07/08 13:09:30 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
--update-glade2 generate and fix Glade 2 code
--update-flexml generate and fix flexml and flex code
--changelog update the CVS changelog
- --distclean "make distclean"
+ --distclean "make distclean" on steroids
--make-woody <dir> change distdir <dir> to a woody distdir
EOF
exit 1
then
echo "generating Visual Studio files..."
- srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+ if test -z "${srcdir}"; then
+ srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+ fi
# The evil ^M
M="`printf '\r'`"
done
# plugins files
- grep '^L_[^ ]*_pic =' Modules.am | while read a b c
+ for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' ${srcdir}/configure.ac`
do
- makefile="`echo $c | sed -e 's@/[^/]*$@/Modules.am@'`"
- plugin="`echo $a | sed 's/L_\(.*\)_pic/\1/'`"
- # this is an attempt at getting a list of plugin sources... we take the
- # production and remove everything that does not contain "module", which
- # means you miss $(NULL), but other variables too.
- cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | awk 'BEGIN{a=0}{if(!a&&$0~/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'`
- hfiles=`for i in ${cfiles} ; do echo $i ; done | grep '\.h$'`
- cfiles=`for i in ${cfiles} ; do echo $i ; done | grep -v '\.h$'`
- for dir in evc msvc
+ mf="${srcdir}/modules/${dir}/Modules.am"
+ for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}`
do
- test "${dir}" = "evc" && suf="vcp" || suf="dsp"
- source="${dir}/plugins.${suf}.in"
- target="${dir}/plugin_${plugin}.${suf}"
- echo "${target}"
- perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${plugin}'/g' < ${source} > ${target}
- for cfile in ${cfiles}
+ # this is an attempt at getting a list of plugin sources... we take the
+ # production and remove everything that does not contain "module", which
+ # means you miss $(NULL), but other variables too.
+ allfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${mf} | awk 'BEGIN{a=0}{if(!a&&$0~/^SOURCES_'${mod}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if($0~/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | grep '\.'`
+ hfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep '\.h$'`
+ cfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep -v '\.h$'`
+ for dir in evc msvc
do
- cat >> ${target} << EOF
+ test "${dir}" = "evc" && suf="vcp" || suf="dsp"
+ source="${dir}/plugins.${suf}.in"
+ target="${dir}/plugin_${mod}.${suf}"
+ echo "${target}"
+ perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
+ for cfile in ${cfiles}
+ do
+ cat >> ${target} << EOF
# Begin Source File${M}
-SOURCE="..\\${cfile}"${M}
-# ADD CPP /D "__VLC__" /D "__PLUGIN__" /D "MODULE_NAME=${plugin}" /D "MODULE_NAME_IS_${plugin}" ${M}
+SOURCE="..\\modules\\`echo ${dir}/${cfile} | sed 's,/,\\\\,g'`"${M}
+# ADD CPP /D "__VLC__" /D "__PLUGIN__" /D "MODULE_NAME=${mod}" /D "MODULE_NAME_IS_${mod}" ${M}
# End Source File${M}
EOF
- done
- # sed is really nicer for this... unfortunately it's broken under cygwin
- # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
- perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
- for hfile in ${hfiles}
- do
- cat >> ${target} << EOF
+ done
+ # sed is really nicer for this... unfortunately it's broken under cygwin
+ # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
+ perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
+ for hfile in ${hfiles}
+ do
+ cat >> ${target} << EOF
# Begin Source File${M}
-SOURCE="..\\${hfile}"${M}
+SOURCE="..\\modules\\`echo ${dir}/${hfile} | sed 's,/,\\\\,g'`"${M}
# End Source File${M}
EOF
+ done
+ # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
+ perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
- # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
- perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
done
done
find include src -name '*.[chm]' -o -name '*.[ch]pp' | sort >> po/POTFILES.in
echo "" >> po/POTFILES.in
echo "# modules" >> po/POTFILES.in
- find modules -name '*.[chm]' -o -name '*.[ch]pp' | grep -v 'gui/win32/' | sort >> po/POTFILES.in
+ find modules -name '*.[chm]' -o -name '*.[ch]pp' \
+ | grep -v '\(gui/win32/\|\.moc\.\)' \
+ | sort >> po/POTFILES.in
# clean old potfiles
cd po
rm -f vlc.pot
then
#set -x
- srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+ if test -z "${srcdir}"; then
+ srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
+ fi
LIBVLC_HEADERS=`getfiles HEADERS_include`
BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
projects / vlc / commitdiff