Oups

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 691ebbc088e9679611680a6cdebc27bc91738d47..12f6570a6a37ab60bc5abf7174d6dedda1df700d 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 \
@@ -77,10 +78,12 @@ HEADERS_include = \
        ../include/vlc_httpd.h \
        ../include/vlc_tls.h \
        ../include/vlc_md5.h \
+       ../include/vlc_devices.h \
        ../include/vlc_image.h \
        ../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 \
@@ -127,7 +130,7 @@ if USE_LIBTOOL
                        ../modules/*.a) echo $$c ;; \
                esac ; \
        done | \
-       sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2_builtin.la/g' | \
+       sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2_builtin.la,g' | \
        while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
 endif
 if BUILD_SHARED
@@ -136,7 +139,7 @@ if BUILD_SHARED
                        ../modules/*.a) echo $$c ;; \
                esac ; \
        done | \
-       sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
+       sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \
        while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
 endif
        touch $@
@@ -146,9 +149,9 @@ endif
 ###############################################################################
 
 libvlc_a_SOURCES = $(SOURCES_libvlc)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
+libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc $(pic)`
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc $(pic)`
+libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc $(pic)`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
@@ -188,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)" ; \
@@ -202,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
 
@@ -247,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 \
@@ -286,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 \
@@ -321,7 +327,8 @@ 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 \
        control/playlist.c \
@@ -346,16 +353,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
@@ -367,6 +368,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
 ###############################################################################
@@ -393,3 +397,4 @@ test_url_LDADD = libvlc.la
 test_url_CFLAGS = $(CFLAGS_tests)
 endif
 
+FORCE: