export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
fi
elif test ".`uname -s`" = ".Darwin"; then
- # Make sure contrib has been built
- if test ! -e ./extras/contrib/config.mak; then
- set +x
- echo ""
- echo "ERR: Contribs haven't been built"
- echo "ERR: Please run:"
- echo "ERR: "
- echo "ERR: 'cd extras/contrib && ./bootstrap && make && cd ../..'"
- echo "ERR: "
- echo "ERR: Make sure fink has been disabled too."
- echo ""
- set -x
- exit 1
- fi
+ set +x
+ echo ""
+ echo "ERR: Contribs haven't been built"
+ echo "ERR: Please run:"
+ echo "ERR: "
+ echo "ERR: 'cd extras/contrib && ./bootstrap && make && cd ../..'"
+ echo "ERR: "
+ echo "ERR: Make sure fink has been disabled too."
+ echo ""
+ set -x
+ exit 1
fi
# Check for autoconf
# Check for libtool
libtoolize="no"
-if glibtoolize --version >/dev/null 2>&1; then
+if test -x extras/contrib/bin/libtoolize; then
+ libtoolize="extras/contrib/bin/libtoolize"
+elif glibtoolize --version >/dev/null 2>&1; then
libtoolize="glibtoolize"
elif libtoolize --version >/dev/null 2>&1; then
libtoolize="libtoolize"
EOF
fi
-rm -f m4/private.m4-tmp1 && cat > m4/private.m4-tmp1 << EOF
-dnl The required AM_CONDITIONAL calls
-dnl XXX: too many conditionals make the build very slow, disabled them
-AC_DEFUN([VLC_CONDITIONALS], [
-EOF
-rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
-dnl The required AC_SUBST calls
-AC_DEFUN([VLC_SUBSTS], [
-EOF
-rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF
-dnl The required AC_OUTPUT calls
-dnl XXX: this feature is only supported starting from automake-1.7
-AC_DEFUN([VLC_MAKEFILES], [AC_OUTPUT([
-EOF
-rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF
+cat >> m4/private.m4 << EOF
dnl Helper macro for vlc-config generation
AC_DEFUN([VLC_CONFIG_HELPER], [
cat >> vlc-config.in << BLAH
# 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`"
mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"
- extra_libs=""
extra_ltlibs=""
for mod in $mods
do
- extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a"
extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"
done
rm -f "${makf}" && cat > "${makf}" << EOF
NULL =
libvlc_LTLIBRARIES =
-noinst_LTLIBRARIES =
EXTRA_DIST = Modules.am
BUILT_SOURCES =
-clean_modules =
+CLEANFILES =
SUBDIRS = ${subdirs}
-SUFFIXES = _plugin\$(LIBEXT) _plugin.a
+SUFFIXES = _plugin\$(LIBEXT) _plugin.la
libvlcdir = \$(libdir)/vlc/\$(basedir)
-EXTRA_LIBRARIES = ${extra_libs}
EXTRA_LTLIBRARIES = ${extra_ltlibs}
include Modules.am
-LTLIBVLC = \$(top_builddir)/src/libvlc.la
-
if HAVE_WIN32
-LIBVLC = -L\$(top_builddir)/src -lvlc
-LIBADD = \$(LIBVLC)
+LTLIBVLC = -L\$(top_builddir)/src -lvlc.dll
+else
+LTLIBVLC = -L\$(top_builddir)/src -lvlc
+endif
+
+AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\
+ -module -no-undefined -shrext \$(LIBEXT) \\
+ -export-symbol-regex ^\$(VLC_ENTRY)\$\$
+
+if USE_LIBTOOL
+AM_LIBADD = \$(LTLIBVLC)
+else
+LIBVLC = -l\$(top_builddir) -lvlc
endif
all: all-modules
endif
# Build a plugin with the adequate linker and linker's flags
-_plugin.a_plugin\$(LIBEXT):
+_plugin.la_plugin\$(LIBEXT):
@mod="\$*" ; mod=\$\${mod#lib} ; \
- ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
+ ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBVLC) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
c++) ld="\$(CXXLINK)" ;; \
objc) ld="\$(OBJCLINK)" ;; \
esac ; \
echo \$\$ld \$< \$\$ldfl ; \
\$\$ld \$< \$\$ldfl
-#ifneq (,\$(findstring cygwin,\$(host)))
-# mv -f "\$@.exe" "\$@"
-#endif
- @if test -f "\$@.exe"; then mv -f "\$@.exe" "\$@"; fi
+ @if test -f "\$@.exe"; then mv -f -- "\$@.exe" "\$@"; fi
if MAINTAINER_MODE
\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
endif
mostlyclean-local:
-if USE_LIBTOOL
-rm -f *.la
-else
- -rm -f *.a *\$(LIBEXT)
+if !USE_LIBTOOL
+ -rm -f *\$(LIBEXT)
endif
-clean-local: \$(clean_modules)
-
### automake creates libvlcdir after running install-*-local
### so we have to create it ourselves first
install-exec-local: all-modules
if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
NODIST=''; else
NODIST='#'; fi
- cat >> m4/private.m4-tmp4 << EOF
+ cat >> m4/private.m4 << EOF
${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
EOF
# Generation of modules/**/Makefile.am
# The ${mod} plugin
EOF
- if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-clean_modules += clean-${mod}
-clean-${mod}:
- -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod})
-
-EOF
- fi
- if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-BUILT_SOURCES += \$(B${mod})
-EOF
- fi
cat >> "${makf}" << EOF
-lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
EOF
if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
+CLEANFILES += "\$(nodist_SOURCES_${mod})"
+BUILT_SOURCES += \$(B${mod})
EOF
fi
cat >> "${makf}" << EOF
-lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags 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_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\
- -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\
- -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined
-lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
-
-lib${mod}_a_SOURCES = \$(SOURCES_${mod})
-EOF
- if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
- fi
- cat >> "${makf}" << EOF
-lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
-lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
-lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\`
-
+lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \$(AM_LDFLAGS)
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
EOF
done
done
-cat >> m4/private.m4-tmp1 << EOF
-])
-EOF
-cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1
-cat >> m4/private.m4-tmp2 << EOF
-])
-EOF
-cat m4/private.m4-tmp2 >> m4/private.m4 && rm -f m4/private.m4-tmp2
-cat >> m4/private.m4-tmp3 << EOF
-])])
-EOF
-cat m4/private.m4-tmp3 >> m4/private.m4 && rm -f m4/private.m4-tmp3
-cat >> m4/private.m4-tmp4 << EOF
+cat >> m4/private.m4 << EOF
BLAH
])
EOF
-cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
-
-echo " done."
###
### classic bootstrap stuff
projects / vlc / blobdiff