mv -> mv -f

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cd716b6d38aec0521c261445aff846c9615069ce..29fc834c6c589c57827081453bf92d690b05cbd2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
 DISTCLEANFILES = stamp-api
 CLEANFILES = misc/modules_builtin.h misc/version.c
-MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
+MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
 
@@ -110,39 +110,41 @@ misc/modules.c: misc/modules_builtin.h
 misc/version.c: FORCE
        $(TOOLBOX) --update-version
 
-# These dependencies are mandatory
-$(SOURCES_libvlc): $(LIB_intl)
-
 ###############################################################################
-# Optional libintl - FIXME, bad dependencies
+# Building builtin modules
 ###############################################################################
-
-../intl/libintl.a: FORCE
-       cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS)
-
-if BUILD_INTL
-LIB_intl = ../intl/libintl.a
+#
+# As long as we use builtins with a shared libvlc, we must build them before
+# we build libvlc. Maybe one day, libvlc will handle multiple modules per
+# shared object, which will make builtins fairly redumdant. Until then, we
+# need this workaround.
+
+stamp-builtins: Makefile ../vlc-config ../config.status
+if USE_LIBTOOL
+       @for c in `$(VLC_CONFIG) --libs builtin`; do \
+               case $$c in \
+                       ../modules/*.a) echo $$c ;; \
+               esac ; \
+       done | \
+       sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2.la/g' | \
+       while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
 endif
+if BUILD_SHARED
+       @if test "$(pic)" = "pic"; then ext="_pic.a"; else ext=".a"; fi ; \
+       for c in `$(VLC_CONFIG) --libs builtin`; do \
+               case $$c in \
+                       ../modules/*.a) echo $$c ;; \
+               esac ; \
+       done | \
+       sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
+       while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
+endif
+       touch $@
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-LIBRARIES_nopic = libvlc.a
-LIBRARIES_pic = libvlc_pic.a
-if HAVE_WIN32
-lib_LIBRARIES = $(LIBRARIES_nopic)
-else
-if BUILD_SHARED
-lib_LIBRARIES = $(LIBRARIES_pic)
-else
-lib_LIBRARIES = $(LIBRARIES_nopic)
-if BUILD_PIC
-lib_LIBRARIES += $(LIBRARIES_pic)
-endif
-endif
-endif
-
 libvlc_a_SOURCES = $(SOURCES_libvlc)
 libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
@@ -153,6 +155,15 @@ libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
 libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
 libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
 
+libvlc_la_SOURCES = $(SOURCES_libvlc)
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
+libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\.a /.la /g'` \
+               -avoid-version -no-undefined
+libvlc_la_DEPENDENCIES = stamp-builtins
+
+
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
 endif
@@ -173,24 +184,37 @@ OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
 endif
 
 # Build libvlc as a shared library
-if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
-if HAVE_WIN32
-OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
+if USE_LIBTOOL
+lib_LTLIBRARIES = libvlc.la
 else
-OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
+lib_LIBRARIES = libvlc.a
+if BUILD_PIC
+lib_LIBRARIES += libvlc_pic.a
 endif
 endif
 
-libvlc$(LIBEXT): $(OBJECTS_libvlc_so)
-       @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic)`" ; \
-       case `$(VLC_CONFIG) --linkage vlc` in \
+if HAVE_WIN32
+if BUILD_SHARED
+DATA_noinst_libvlc = libvlc$(LIBEXT)
+endif
+
+libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
+       @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
+       case `$(VLC_CONFIG) --linkage vlc builtin` in \
          c++)  ld="$(CXXLINK)" ;; \
          objc) ld="$(OBJCLINK)" ;; \
          c|*)  ld="$(LINK)" ;; \
        esac ; \
-       echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \
-       $$ld $(OBJECTS_libvlc_so) $$ldfl
+       echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
+       $$ld $(libvlc_a_OBJECTS) \
+               -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl
+# It sucks big time, but we have to do that to link vlc properly
+# on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over
+# libvlc$(LIBEXT)
+       rm -f libvlc.a
+# Cygwin work-around
+       @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+endif
 
 EXTRA_DIST += \
        $(SOURCES_libvlc_beos) \
@@ -305,6 +329,7 @@ SOURCES_libvlc_common = \
        control/libvlc_vlm.c \
        control/libvlc_input.c \
        control/libvlc_video.c \
+       control/libvlc_audio.c \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \
@@ -322,13 +347,15 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
-# Install the symlinks and shared libvlc
+if !USE_LIBTOOL
+# Install shared libvlc
 install-exec-local:
        test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
 
 # the opposite of install-{data,exec}-local
 uninstall-local:
        test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
+endif
 
 ###############################################################################
 # Stamp rules