* No longer use the $(pic) variable, since all flags are properly set

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c39ab5fc63f4bf0442f5b79fe80de23880fe91c..ac7e5df4b25eaf6d2eb3a595e59282c150c39c03 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 \
@@ -69,7 +70,6 @@ HEADERS_include = \
        ../include/vlc_config.h \
        ../include/vlc_cpu.h \
        ../include/vlc_demux.h \
-       ../include/vlc_devices.h \
        ../include/vlc_error.h \
        ../include/vlc_es.h \
        ../include/vlc_es_out.h \
@@ -83,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 \
@@ -129,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
@@ -138,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 $@
@@ -148,18 +149,17 @@ endif
 ###############################################################################
 
 libvlc_a_SOURCES = $(SOURCES_libvlc)
-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_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)
 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
-libvlc_la_DEPENDENCIES = stamp-builtins
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` -no-undefined -export-symbols libvlc.sym
+libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
 
 
 if HAVE_BEOS
@@ -188,15 +188,22 @@ else
 lib_LIBRARIES = libvlc.a
 endif
 
+if HAVE_WIN32
+pic =
+else
+pic = pic
+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)" ; \
+       @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin pic` $(INCLUDED_LIBINTL)" ; \
        case `$(VLC_CONFIG) --linkage vlc builtin` in \
          c++)  ld="$(CXXLINK)" ;; \
          objc) ld="$(OBJCLINK)" ;; \
@@ -204,12 +211,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
 
@@ -249,6 +256,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 \
@@ -288,6 +296,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 \
@@ -323,7 +332,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 \
@@ -349,16 +358,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
@@ -370,6 +373,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
 ###############################################################################
@@ -378,6 +384,10 @@ stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
+libvlc.sym:
+       rm -f stamp-api
+       $(MAKE) stamp-api
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################
@@ -396,3 +406,4 @@ test_url_LDADD = libvlc.la
 test_url_CFLAGS = $(CFLAGS_tests)
 endif
 
+FORCE: