X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=12f6570a6a37ab60bc5abf7174d6dedda1df700d;hb=5abd95e1ceeabf24b2d0333b7181635a5881a097;hp=98ee7ff0995b6cbfdcf33859a618c65481b091a1;hpb=07e87b93860ce1cbbb6cbe86cc61461648925f78;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 98ee7ff099..12f6570a6a 100644
--- 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 \
@@ -82,6 +83,7 @@ HEADERS_include = \
 	../include/vlc_input.h \
 	../include/vlc_interaction.h \
 	../include/vlc_interface.h \
+	../include/vlc_intf_strings.h \
 	../include/vlc_keys.h \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
@@ -157,7 +159,7 @@ 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/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
-		-avoid-version -no-undefined -shrext $(LIBEXT).0d
+		-avoid-version -no-undefined
 libvlc_la_DEPENDENCIES = stamp-builtins
 
 
@@ -189,10 +191,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 +206,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
 
@@ -248,6 +251,7 @@ SOURCES_libvlc_common = \
 	interface/interface.c \
 	interface/intf_eject.c \
 	interface/interaction.c \
+	playlist/playlist_internal.h \
 	playlist/thread.c \
 	playlist/control.c \
 	playlist/engine.c \
@@ -287,6 +291,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 \
@@ -322,7 +327,7 @@ SOURCES_libvlc_common = \
 	misc/update.c \
 	misc/vlm.c \
 	misc/xml.c \
-	misc/hashtables.c \
+	misc/dict.c \
 	misc/devices.c \
 	extras/libc.c \
 	control/core.c \