- fixed Cygwin issue when linking/building shared libvlc.dll

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 258bc98264cf006b607584cbade80aed496ce01e..942e4ed9720f0c2c4546a9baec0294f554dd7163 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,6 +57,7 @@ HEADERS_include = \
        ../include/os_specific.h \
        ../include/snapshot.h \
        ../include/stream_output.h \
+       ../include/vlc_streaming.h \
        ../include/variables.h \
        ../include/video_output.h \
        ../include/vlc_access.h \
@@ -189,10 +190,11 @@ endif
 
 if HAVE_WIN32
 if BUILD_SHARED
-DATA_noinst_libvlc = libvlc$(LIBEXT)
+DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
 endif
 
 libvlc.dll.a: libvlc$(LIBEXT)
+       $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS)
 
 libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
        @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
@@ -203,12 +205,12 @@ libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
        esac ; \
        echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
        $$ld $(libvlc_a_OBJECTS) \
-               -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl
+               $$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
+# Cygwin libtool work-around
        @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 endif
 
@@ -287,6 +289,7 @@ SOURCES_libvlc_common = \
        audio_output/intf.c \
        stream_output/stream_output.c \
        stream_output/announce.c \
+       stream_output/profiles.c \
        stream_output/sap.c \
        osd/osd.c \
        osd/osd_parser.c \
@@ -348,16 +351,10 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
-
 if !USE_LIBTOOL
 if !BUILD_SHARED
 SOURCES_libvlc += misc/version.c
 CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-       $(TOOLBOX) --update-version
-FORCE:
-
 endif
 
 # Install shared libvlc
@@ -369,6 +366,9 @@ uninstall-local:
        test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 endif
 
+misc/version.c: FORCE
+       $(TOOLBOX) --update-version
+
 ###############################################################################
 # Stamp rules
 ###############################################################################
@@ -395,3 +395,4 @@ test_url_LDADD = libvlc.la
 test_url_CFLAGS = $(CFLAGS_tests)
 endif
 
+FORCE: