Move encoding and language stuff to their own directory

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3dc586fec7354a1cf79f2512bca2a185b2b9d970..4dfa254cf45c0e02231f1b13801650f70f05a71b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,8 +124,9 @@ misc/modules.c: misc/modules_builtin.h
 # shared object, which will make builtins fairly redumdant. Until then, we
 # need this workaround.
 
-stamp-builtins: Makefile ../vlc-config ../config.status
+
 if BUILD_SHARED
+stamp-builtins: Makefile ../vlc-config ../config.status
        @for c in `$(VLC_CONFIG) --libs builtin`; do \
                case $$c in \
                        ../modules/*.a) echo $$c ;; \
@@ -133,29 +134,34 @@ if BUILD_SHARED
        done | \
        sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \
        while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
-endif
        touch $@
+endif
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-libvlc_a_SOURCES = $(SOURCES_libvlc)
-nodist_libvlc_a_SOURCES = $(SOURCES_libvlc)
+libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
+nodist_libvlc_a_SOURCES = misc/version.c
 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)
-nodist_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` \
        -no-undefined -export-symbols libvlc.sym -version-info 0:0:0
-libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
+libvlc_la_DEPENDENCIES = libvlc.sym
 
+libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
+libvlc_control_la_LIBADD = libvlc.la
+libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+libvlc_control_la_LDFLAGS = \
+       -no-undefined -export-symbols-regex '_?(libvlc|mediacontrol)_.*' \
+       -version-info 0:0:0
 
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
@@ -178,7 +184,7 @@ endif
 
 # Build libvlc as a shared library
 if USE_LIBTOOL
-lib_LTLIBRARIES = libvlc.la
+lib_LTLIBRARIES = libvlc.la libvlc-control.la
 else
 lib_LIBRARIES = libvlc.a
 endif
@@ -308,21 +314,21 @@ SOURCES_libvlc_common = \
        network/httpd.c \
        network/rootwrap.c \
        network/tls.c \
-       misc/charset.c \
+       text/charset.c \
+       text/strings.c \
+       text/unicode.c \
+       text/iso_lang.c \
+       text/iso-639_def.h \
        misc/md5.c \
        misc/mtime.c \
        misc/block.c \
        misc/modules.c \
        misc/threads.c \
        misc/stats.c \
-       misc/strings.c \
-       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 \
        misc/messages.c \
        misc/objects.c \
        misc/variables.c \
@@ -333,16 +339,6 @@ SOURCES_libvlc_common = \
        misc/dict.c \
        misc/devices.c \
        extras/libc.c \
-       control/core.c \
-       control/log.c \
-       control/playlist.c \
-       control/vlm.c \
-       control/input.c \
-       control/video.c \
-       control/audio.c \
-       control/mediacontrol_core.c \
-       control/mediacontrol_util.c \
-       control/mediacontrol_audio_video.c \
        $(NULL)
 
 SOURCES_libvlc = \
@@ -354,13 +350,21 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
+SOURCES_libvlc_control = \
+       control/core.c \
+       control/log.c \
+       control/playlist.c \
+       control/vlm.c \
+       control/input.c \
+       control/video.c \
+       control/audio.c \
+       control/mediacontrol_core.c \
+       control/mediacontrol_util.c \
+       control/mediacontrol_audio_video.c
+
 if !USE_LIBTOOL
 if !BUILD_SHARED
-SOURCES_nodist_libvlc += misc/version.c
 CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-       $(TOOLBOX) --update-version
 endif
 
 # Install shared libvlc
@@ -372,6 +376,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
 ###############################################################################
@@ -380,9 +387,11 @@ 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
+libvlc.sym: $(HEADERS_include)
+       rm -f libvlc.sym
+       (cd $(srcdir) && cat $(HEADERS_include) ) | \
+       sed -ne 's/^.*VLC_EXPORT\s*(\s*\w.*\S\s*,\s*\(\w*\)\s*,\s*(\s*\w.*\S\s*)\s*)[^)]*$$/\1/p' \
+               > libvlc.sym
 
 ###############################################################################
 # Unit/regression test