Revert revision [17165] because it broke libtool build on linux

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 691ebbc088e9679611680a6cdebc27bc91738d47..294baa060406588178bdea3cd2b216166cfd2691 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,9 +57,11 @@ 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 \
+       ../include/vlc_arrays.h \
        ../include/vlc_acl.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
@@ -77,10 +79,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 \
@@ -121,22 +125,13 @@ misc/modules.c: misc/modules_builtin.h
 # need this workaround.
 
 stamp-builtins: Makefile ../vlc-config ../config.status
-if USE_LIBTOOL
-       @for c in `$(VLC_CONFIG) --libs builtin`; do \
-               case $$c in \
-                       ../modules/*.a) echo $$c ;; \
-               esac ; \
-       done | \
-       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
        @for c in `$(VLC_CONFIG) --libs builtin`; do \
                case $$c in \
                        ../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,18 +141,18 @@ 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` -DUSE_BUILTINS
+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` \
+       -no-undefined -export-symbols libvlc.sym -version-info 0:0:0
+libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
 
 
 if HAVE_BEOS
@@ -186,15 +181,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)" ;; \
@@ -202,12 +204,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
 
@@ -243,10 +245,12 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
        libvlc.c \
+       libvlc-common.c \
        libvlc.h \
        interface/interface.c \
        interface/intf_eject.c \
        interface/interaction.c \
+       playlist/playlist_internal.h \
        playlist/thread.c \
        playlist/control.c \
        playlist/engine.c \
@@ -264,6 +268,7 @@ SOURCES_libvlc_common = \
        input/demux.c \
        input/es_out.c \
        input/input.c \
+       input/meta.c \
        input/input_internal.h \
        input/stream.c \
        input/mem_stream.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 \
@@ -311,6 +317,7 @@ SOURCES_libvlc_common = \
        misc/unicode.c \
        misc/cpu.c \
        misc/configuration.c \
+       misc/configuration_chain.c \
        misc/image.c \
        misc/iso_lang.c \
        misc/iso-639_def.h \
@@ -321,7 +328,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 \
@@ -334,9 +342,6 @@ SOURCES_libvlc_common = \
        control/mediacontrol_audio_video.c \
        $(NULL)
 
-# These should be distributed, but not compiled
-EXTRA_DIST += control/mediacontrol_init.c control/mediacontrol_plugin.c
-
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
        $(OPT_SOURCES_libvlc_beos) \
@@ -346,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
@@ -367,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
 ###############################################################################
@@ -375,6 +377,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
 ###############################################################################
@@ -393,3 +399,4 @@ test_url_LDADD = libvlc.la
 test_url_CFLAGS = $(CFLAGS_tests)
 endif
 
+FORCE: