Typo

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index de41e13f7a7c72cef970aff5938e7518a09847b5..85b4ef5e679f386c56fbd1e40132c4559693f41f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,7 @@ NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
        vlc-control.pc.in \
        vlc-plugin.pc.in \
+       libvlc.sym \
        libvlccore.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
@@ -24,7 +25,6 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
-       ../include/vlc/common.h \
        ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
        ../include/vlc/libvlc_structures.h \
@@ -36,70 +36,70 @@ pkginclude_HEADERS = \
        $(NULL)
 
 pluginsinclude_HEADERS = \
-       ../include/vlc_arrays.h \
-       ../include/vlc_common.h \
-       ../include/vlc_config.h \
-       ../include/vlc_configuration.h \
-       ../include/vlc_main.h \
-       ../include/vlc_messages.h \
-       ../include/vlc_modules.h \
-       ../include/vlc_mtime.h \
-       ../include/vlc_objects.h \
-       ../include/vlc_plugin.h \
-       ../include/vlc_threads.h \
-       ../include/vlc_variables.h \
-       $(NULL)
-
-noinst_HEADERS = \
-       ../include/iso_lang.h \
-       ../include/mmx.h \
        ../include/vlc_access.h \
        ../include/vlc_acl.h \
        ../include/vlc_aout.h \
+       ../include/vlc_arrays.h \
        ../include/vlc_bits.h \
        ../include/vlc_block.h \
        ../include/vlc_block_helper.h \
        ../include/vlc_charset.h \
        ../include/vlc_codec.h \
-       ../include/vlc_codec_synchro.h \
-       ../include/vlc_codecs.h \
+       ../include/vlc_common.h \
+       ../include/vlc_config.h \
        ../include/vlc_config_cat.h \
+       ../include/vlc_configuration.h \
        ../include/vlc_demux.h \
-       ../include/vlc_devices.h \
        ../include/vlc_epg.h \
        ../include/vlc_es.h \
        ../include/vlc_es_out.h \
        ../include/vlc_events.h \
        ../include/vlc_filter.h \
-       ../include/vlc_fixups.h \
        ../include/vlc_gcrypt.h \
        ../include/vlc_httpd.h \
        ../include/vlc_image.h \
        ../include/vlc_input.h \
-       ../include/vlc_interface.h \
-       ../include/vlc_intf_strings.h \
-       ../include/vlc_keys.h \
+       ../include/vlc_main.h \
        ../include/vlc_md5.h \
+       ../include/vlc_messages.h \
        ../include/vlc_meta.h \
-       ../include/vlc_network.h \
-       ../include/vlc_osd.h \
-       ../include/vlc_pgpkey.h \
+       ../include/vlc_modules.h \
+       ../include/vlc_mtime.h \
+       ../include/vlc_objects.h \
        ../include/vlc_playlist.h \
+       ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
        ../include/vlc_services_discovery.h \
        ../include/vlc_sout.h \
        ../include/vlc_stream.h \
-       ../include/vlc_streaming.h \
        ../include/vlc_strings.h \
-       ../include/vlc_tls.h \
-       ../include/vlc_update.h \
+       ../include/vlc_threads.h \
        ../include/vlc_url.h \
+       ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
-       ../include/vlc_vod.h \
        ../include/vlc_vout.h \
        ../include/vlc_xml.h \
        $(NULL)
 
+noinst_HEADERS = \
+       ../include/mmx.h \
+       ../include/vlc_codec_synchro.h \
+       ../include/vlc_codecs.h \
+       ../include/vlc_devices.h \
+       ../include/vlc_fixups.h \
+       ../include/vlc_interface.h \
+       ../include/vlc_intf_strings.h \
+       ../include/vlc_iso_lang.h \
+       ../include/vlc_keys.h \
+       ../include/vlc_network.h \
+       ../include/vlc_osd.h \
+       ../include/vlc_pgpkey.h \
+       ../include/vlc_streaming.h \
+       ../include/vlc_tls.h \
+       ../include/vlc_update.h \
+       ../include/vlc_vod.h \
+       $(NULL)
+
 modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
        rm -f -- "$@.tmp"
        cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
@@ -189,7 +189,8 @@ libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DMODULE_STRING=\"control\"
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
        -version-info 2:0:0 \
-       -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
+       -export-symbols $(srcdir)/libvlc.sym
+libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 
 EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
@@ -263,9 +264,9 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
        libvlc.c \
-       libvlc-common.c \
        libvlc.h \
        libvlc-module.c \
+       version.c \
        interface/interface.h \
        interface/interface.c \
        interface/intf_eject.c \
@@ -356,6 +357,7 @@ SOURCES_libvlc_common = \
        misc/variables.h \
        misc/variables.c \
        misc/error.c \
+       misc/update.h \
        misc/update.c \
        misc/xml.c \
        misc/devices.c \