X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=79f9fb1c4453dfa43e2770d1b17f565ea08653f7;hb=343ef81a3faefc22eecafdcae5a9d2a1af58d8be;hp=a3d297f66de35c9762a0d2930a687e6b9c91a155;hpb=935af8b0594944307465a9d25c27625f663681b4;p=vlc

diff --git a/bootstrap b/bootstrap
index a3d297f66d..79f9fb1c44 100755
--- a/bootstrap
+++ b/bootstrap
@@ -221,21 +221,16 @@ EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
 include Modules.am
 
-if HAVE_WIN32
-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)
+	-module -no-undefined -shrext \$(LIBEXT) 
+if HAVE_COMPILER_EXPORT
+AM_LDFLAGS += -export-dynamic
 else
-LIBVLC = -l\$(top_builddir) -lvlc
+AM_LDFLAGS += -export-symbol-regex ^\$(VLC_ENTRY)\$\$
 endif
+AM_LIBADD = \$(LTLIBVLC)
 
 all: all-modules
 
@@ -244,18 +239,10 @@ nice:
 
 # Find out which modules were enabled and tell make to build them
 all-modules:
-if USE_LIBTOOL
 	@set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
 	z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; \\
 	\`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
 	test -z "\$\$fail"
-else
-	@set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
-	z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; \\
-	z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; \\
-	\`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
-	test -z "\$\$fail"
-endif
 
 # Build a plugin with the adequate linker and linker's flags
 _plugin.la_plugin\$(LIBEXT):
@@ -268,7 +255,6 @@ _plugin.la_plugin\$(LIBEXT):
 	esac ; \
 	echo \$\$ld \$< \$\$ldfl ; \
 	\$\$ld \$< \$\$ldfl
-	@if test -f "\$@.exe"; then mv -f -- "\$@.exe" "\$@"; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
@@ -276,53 +262,25 @@ if MAINTAINER_MODE
 endif
 
 mostlyclean-local:
-	-rm -f *.la
-if !USE_LIBTOOL
-	-rm -f *\$(LIBEXT)
-endif
+	-rm -f -- *.la
 
 ### automake creates libvlcdir after running install-*-local
 ### so we have to create it ourselves first
 install-exec-local: all-modules
-if USE_LIBTOOL
 	@if test -z "\$(libvlc_LTLIBRARIES)"; then \
 	  z=\$\$(\$(VLC_CONFIG) --list plugin); \
 	  m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
 	  test -z "\$\$m" || \
   	    \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install-libvlcLTLIBRARIES || exit \$\$? ; \
 	fi
-else
-	mkdir -p -- "\$(DESTDIR)\$(libvlcdir)"
-	@z=\$\$(\$(VLC_CONFIG) --list plugin); \
-	for mod in \$(mods); do \
-	  case "\$\$z " \
-	    in *\ \$\${mod}\ *) \
-	      echo \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \
-	      \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
-	      ;; \
-	  esac; \
-	done
-endif
 
 uninstall-local:
-if USE_LIBTOOL
 	@if test -z "\$(libvlc_LTLIBRARIES)"; then \
 	  z=\$\$(\$(VLC_CONFIG) --list plugin); \
 	  m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
 	  test -z "\$\$m" || \
 	    \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall-libvlcLTLIBRARIES || exit \$\$?; \
 	fi
-else
-	@z=\$\$(\$(VLC_CONFIG) --list plugin); \
-	for mod in \$(mods); do \
-	  case "\$\$z " \
-	    in *\ \$\${mod}\ *) \
-	      echo rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" ; \
-	      rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" || true; \
-	      ;; \
-	  esac; \
-	done
-endif
 
 EOF
   for mod in $mods
@@ -349,7 +307,7 @@ lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
 EOF
     if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
-CLEANFILES += "\$(nodist_SOURCES_${mod})"
+CLEANFILES += \$(nodist_SOURCES_${mod})
 BUILT_SOURCES += \$(B${mod})
 EOF
     fi
@@ -363,6 +321,8 @@ EOF
   done
 done
 
+printf "\n"
+
 cat >> m4/private.m4 << EOF
 BLAH
 ])
@@ -404,25 +364,9 @@ if test -f "ltmain.sh"; then
   mv ltmain.sh autotools/
 fi
 
-# patch for DLL link for libtool on cygwin (remove when fixed)
-if test ".`uname -s|sed -n '/^CYGWIN/p'`" != "."; then
-patch -s -p0 << 'EOF'
---- autotools/ltmain.orig	2006-12-05 15:15:42.064607000 +0000
-+++ autotools/ltmain.sh	2006-12-05 15:16:24.705777800 +0000
-@@ -4360,7 +4360,7 @@
- 
-     prog)
-       case $host in
--	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,;s,.dll.exe$,.dll,'` ;;
-       esac
-       if test -n "$vinfo"; then
- 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-EOF
-fi
-
 # Do the rest
 ${autopoint} -f
+rm -f po/Makevars.template
 ${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}