Uninlined es_format_t functions and added video_format_FixRgb helper.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index fcc9e2cc5ea321ebe158e2e973df949925f3212a..23067dc9095d06257dd46b49c9692451b71c3b13 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,7 +96,6 @@ noinst_HEADERS = \
        ../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 \
@@ -163,7 +162,7 @@ nice:
 
 lib_LTLIBRARIES = libvlccore.la libvlc.la
 
-AM_LDFLAGS = -no-undefined -no-install
+AM_LDFLAGS = -no-undefined
 if HAVE_WIN32
 AM_LDFLAGS += -avoid-version
 endif
@@ -179,18 +178,27 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DPLUGIN_PATH=\"$(pkglibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 0:0:0
+       -version-info 0:1:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
+if HAVE_WIN32
+libvlccore_la_DEPENDENCIES += $(DATA_win32_rc_lib)
+libvlccore_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
+endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_la_LIBADD = libvlccore.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DMODULE_STRING=\"control\"
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
-       -version-info 2:0:0 \
+       -version-info 2:1:0 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
+if HAVE_WIN32
+libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
+libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
+endif
+
 
 EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
@@ -201,6 +209,7 @@ EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
        $(SOURCES_libvlc_sout) \
+       $(SOURCES_libvlc_vlm) \
        $(NULL)
 if HAVE_BEOS
 libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
@@ -231,6 +240,9 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
 if ENABLE_SOUT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
+if ENABLE_VLM
+libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
+endif
 endif
 
 SOURCES_libvlc_beos = \
@@ -333,6 +345,7 @@ SOURCES_libvlc_common = \
        misc/rand.c \
        misc/mtime.c \
        misc/block.c \
+       misc/es_format.c \
        modules/modules.h \
        modules/modules.c \
        modules/cache.c \
@@ -365,16 +378,18 @@ SOURCES_libvlc_common = \
        $(NULL)
 
 SOURCES_libvlc_sout = \
-       input/vlm.c \
-       input/vlmshell.c \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
        stream_output/announce.c \
-       stream_output/profiles.c \
        stream_output/sap.c \
        stream_output/sdp.c \
        $(NULL)
 
+SOURCES_libvlc_vlm = \
+       input/vlm.c \
+       input/vlmshell.c \
+       $(NULL)
+
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
        $(OPT_SOURCES_libvlc_beos) \
@@ -463,11 +478,15 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        eval $$cmd
 
 if HAVE_WIN32
-DATA_win32_rc = $(noinst_DATA)
-noinst_DATA = vlc_win32_rc.$(OBJEXT)
+DATA_win32_rc = vlc_win32_rc.$(OBJEXT)
+DATA_win32_rc_lib = libvlc_win32_rc.$(OBJEXT)
+noinst_DATA = $(DATA_win32_rc) $(DATA_win32_rc_lib)
+
+vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc
+       $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
-vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc
-       $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(top_srcdir)/share -i $< -o $@
+libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+       $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 endif
 endif
 
@@ -487,29 +506,36 @@ dist_check_SCRIPTS = check_symbols check_headers
 TESTS = $(check_PROGRAMS) check_symbols
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
+LDFLAGS_tests = $(AM_LDFLAGS) -no-install
 
 test_block_SOURCES = test/block.c
 test_block_LDADD = libvlccore.la
 test_block_CFLAGS = $(CFLAGS_tests)
+test_block_LDFLAGS = $(LDFLAGS_tests)
 
 test_dictionary_SOURCES = test/dictionary.c
 test_dictionary_LDADD = libvlccore.la
 test_dictionary_CFLAGS = $(CFLAGS_tests)
+test_dictionary_LDFLAGS = $(LDFLAGS_tests)
 
 test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
 test_i18n_atof_LDADD = libvlccore.la
 test_i18n_atof_CFLAGS = $(CFLAGS_tests)
+test_i18n_atof_LDFLAGS = $(LDFLAGS_tests)
 
 test_url_SOURCES = test/url.c
 test_url_LDADD = libvlccore.la
 test_url_CFLAGS = $(CFLAGS_tests)
+test_url_LDFLAGS = $(LDFLAGS_tests)
 
 test_utf8_SOURCES = test/utf8.c
 test_utf8_LDADD = libvlccore.la
 test_utf8_CFLAGS = $(CFLAGS_tests)
+test_utf8_LDFLAGS = $(LDFLAGS_tests)
 
 test_headers_SOURCES = test/headers.c
 test_headers_CFLAGS = $(CFLAGS_tests)
+test_headers_LDFLAGS = $(LDFLAGS_tests)
 
 check-local:
        for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \