Skip to content

V
vlc
Commit e2d69c72 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* bootstrap: 

    + Removed the Modules.am generation. To build module/foo/libfoo.so, you
      now need to cd modules/foo and make libfoo.so.
    + Workaround for Solaris sed. Which sucks. Did I mention that before?
parent c0ec41c7
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 42 deletions
.cvsignore
View file @ e2d69c72
...@@ -17,7 +17,6 @@ conftest.cc ...@@ -17,7 +17,6 @@ conftest.cc
autom4te.cache autom4te.cache
Makefile.in Makefile.in
Makefile Makefile
Modules.am
build-stamp build-stamp
configure-stamp configure-stamp
stamp-h* stamp-h*
......
Makefile.am
View file @ e2d69c72
...@@ -14,7 +14,6 @@ EXTRA_DIST = \ ...@@ -14,7 +14,6 @@ EXTRA_DIST = \
HACKING \ HACKING \
INSTALL.win32 \ INSTALL.win32 \
MAINTAINERS \ MAINTAINERS \
Modules.am \
README.MacOSX.rtf \ README.MacOSX.rtf \
bootstrap \ bootstrap \
install-win32 \ install-win32 \
...@@ -371,10 +370,10 @@ endif ...@@ -371,10 +370,10 @@ endif
# Install the modules and the symlinks # Install the modules and the symlinks
install-exec-local: install-exec-local:
for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \ for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
$(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \ $(INSTALL) -m 755 "modules/$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \
fi ; done fi ; done
for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \ for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
$(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ $(INSTALL) -m 644 "modules/$$i" "$(DESTDIR)$(libdir)/vlc" ; \
fi ; done fi ; done
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" && \ rm -f "$(DESTDIR)$(bindir)/$$i" && \
...@@ -393,7 +392,7 @@ VLC.app: vlc ...@@ -393,7 +392,7 @@ VLC.app: vlc
$(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
for i in "" `$(VLC_CONFIG) --target plugin` ; do \ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \ if test -n "$$i" ; then $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" \
"$(srcdir)/VLC.app/Contents/MacOS/modules" ; \ "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done fi ; done
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
...@@ -448,7 +447,7 @@ package-win32: ...@@ -448,7 +447,7 @@ package-win32:
mkdir -p "$(srcdir)/tmp/plugins" mkdir -p "$(srcdir)/tmp/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \ if test -n "$$i" ; then \
$(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \ $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
fi ; done fi ; done
for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
...@@ -623,11 +622,6 @@ mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc ...@@ -623,11 +622,6 @@ mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
endif endif
endif endif
###############################################################################
# Modules
###############################################################################
include Modules.am
############################################################################### ###############################################################################
# Force rule # Force rule
############################################################################### ###############################################################################
......
bootstrap
View file @ e2d69c72
#! /bin/sh #! /bin/sh
## bootstrap file for the VLC media player ## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.55 2003/07/01 14:25:47 sam Exp $ ## $Id: bootstrap,v 1.56 2003/07/01 16:25:24 sam Exp $
## ##
## Authors: Sam Hocevar <sam@zoy.org> ## Authors: Sam Hocevar <sam@zoy.org>
...@@ -36,8 +36,7 @@ INSTALLSUCKS=no ...@@ -36,8 +36,7 @@ INSTALLSUCKS=no
printf "generating modules/**/Makefile.am and m4/private.m4" printf "generating modules/**/Makefile.am and m4/private.m4"
# Prepare Modules.am and m4/private.m4 # Prepare m4/private.m4
rm -f Modules.am && echo > Modules.am
rm -f m4/private.m4 && cat > m4/private.m4 << EOF rm -f m4/private.m4 && cat > m4/private.m4 << EOF
dnl Private VLC macros - generated by bootstrap dnl Private VLC macros - generated by bootstrap
...@@ -72,16 +71,16 @@ SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs` ...@@ -72,16 +71,16 @@ SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
#DIST_SUBDIRS = \$(SUBDIRS) #DIST_SUBDIRS = \$(SUBDIRS)
EOF EOF
for dir in `sed -ne 's,\(modules/.*\)/Makefile,\1,p' configure.ac` for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
do do
printf "." printf "."
mf="${dir}/Modules.am" mf="modules/${dir}/Modules.am"
basedir="`echo ${dir} | cut -f2 -d/`" basedir="`echo ${dir} | cut -f1 -d/`"
# automake will not recurse for make dist if we don't define SUBDIRS = . # automake will not recurse for make dist if we don't define SUBDIRS = .
subdirs="`sed -ne 's,'${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`" subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
#parent=`echo ${dir} | sed -e 's@[^/]*@..@g'` #parent=`echo ${dir} | sed -e 's@[^/]*@..@g'`
#echo " ${dir}/Makefile" >> m4/private.m4-tmp3 #echo " modules/${dir}/Makefile" >> m4/private.m4-tmp3
rm -f ${dir}/Makefile.am && cat > ${dir}/Makefile.am << EOF rm -f modules/${dir}/Makefile.am && cat > modules/${dir}/Makefile.am << EOF
# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead # Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead
...@@ -109,16 +108,6 @@ EOF ...@@ -109,16 +108,6 @@ EOF
#dnl AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes) #dnl AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes)
#dnl AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes) #dnl AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes)
#EOF #EOF
cat >> Modules.am << EOF
${dir}/lib${mod}_plugin: ${dir}/lib${mod}_plugin\$(LIBEXT)
${dir}/lib${mod}_plugin\$(LIBEXT): include/vlc_symbols.h FORCE
cd ${dir} && \$(MAKE) lib${mod}_plugin\$(LIBEXT)
${dir}/lib${mod}.a: include/vlc_symbols.h FORCE
cd ${dir} && \$(MAKE) lib${mod}.a
${dir}/lib${mod}_pic.a: include/vlc_symbols.h FORCE
cd ${dir} && \$(MAKE) lib${mod}_pic.a
EOF
cat >> m4/private.m4-tmp4 << EOF cat >> m4/private.m4-tmp4 << EOF
${mod}) list="\\\${list} ${dir}/lib${mod}" ;; ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
EOF EOF
...@@ -129,7 +118,7 @@ EOF ...@@ -129,7 +118,7 @@ EOF
# the resulting file size. # the resulting file size.
# - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to # - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to
# work properly with any automake version I tested. # work properly with any automake version I tested.
cat >> ${dir}/Makefile.am << EOF cat >> modules/${dir}/Makefile.am << EOF
# The ${mod} plugin # The ${mod} plugin
all: all-${mod} all: all-${mod}
...@@ -147,49 +136,49 @@ D${count}p = lib${mod}_plugin\$(LIBEXT) ...@@ -147,49 +136,49 @@ D${count}p = lib${mod}_plugin\$(LIBEXT)
L${count}b = lib${mod}.a L${count}b = lib${mod}.a
L${count}pic = lib${mod}_pic.a L${count}pic = lib${mod}_pic.a
EOF EOF
if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
B${count}p = \$(nodist_SOURCES_${mod}) B${count}p = \$(nodist_SOURCES_${mod})
B${count}b = \$(nodist_SOURCES_${mod}) B${count}b = \$(nodist_SOURCES_${mod})
EOF EOF
fi fi
cat >> ${dir}/Makefile.am << EOF cat >> modules/${dir}/Makefile.am << EOF
endif endif
EOF EOF
if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
${PRIVATE}BUILT_SOURCES += \$(B${count}p) \$(B${count}b) ${PRIVATE}BUILT_SOURCES += \$(B${count}p) \$(B${count}b)
EOF EOF
fi fi
cat >> ${dir}/Makefile.am << EOF cat >> modules/${dir}/Makefile.am << EOF
${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) ${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
EOF EOF
if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) ${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
EOF EOF
fi fi
cat >> ${dir}/Makefile.am << EOF cat >> modules/${dir}/Makefile.am << EOF
lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\` lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
EOF EOF
if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
EOF EOF
fi fi
cat >> ${dir}/Makefile.am << EOF cat >> modules/${dir}/Makefile.am << EOF
lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\` lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\` lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\` lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
EOF EOF
if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF if [ "${NODIST}" != "#" ]; then cat >> modules/${dir}/Makefile.am << EOF
nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
EOF EOF
fi fi
cat >> ${dir}/Makefile.am << EOF cat >> modules/${dir}/Makefile.am << EOF
lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
...@@ -238,7 +227,7 @@ echo "done." ...@@ -238,7 +227,7 @@ echo "done."
set -x set -x
# remove autotools cruft # remove autotools cruft
rm -f aclocal.m4 configure configure.ac.in config.log rm -f aclocal.m4 configure configure.ac.in config.log Modules.am
# remove old autotools extra cruft # remove old autotools extra cruft
rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove new autotools extra cruft # remove new autotools extra cruft
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment