mux: avi: don't try to delete failed stream

[vlc] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ad9ce00cea580740a1d36b6fa55a1524544a27c9..be1b6beaf6f6d5f1eb98870a44444aae4e5690ec 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
 pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = -DMODULE_STRING=\"libvlc\"
 AM_CFLAGS = $(CFLAGS_libvlc)
 
@@ -51,21 +51,24 @@ libvlc_la_SOURCES = \
        media_list_path.h \
        media_list_player.c \
        media_library.c \
-       media_discoverer.c \
-       ../src/revision.c
+       media_discoverer.c
 EXTRA_DIST = libvlc.pc.in libvlc.sym ../include/vlc/libvlc_version.h.in
 
-libvlc_la_LIBADD = $(LIBS_libvlc) \
-       ../src/libvlccore.la ../compat/libcompat.la $(LIBM)
+libvlc_la_LIBADD = \
+       ../src/libvlccore.la ../compat/libcompat.la $(LIBPTHREAD) $(LIBM)
 libvlc_la_LDFLAGS = \
        $(LDFLAGS_libvlc) \
        -no-undefined \
-       -version-info 8:0:3 \
+       -version-info 10:0:5 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym
 if HAVE_WIN32
 libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT)
-libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version
+libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version \
+                                        -Wc,--static -Wc,-static-libgcc
+endif
+if HAVE_OS2
+libvlc_la_LDFLAGS += -avoid-version
 endif
 
 pkgconfig_DATA = libvlc.pc