Factorize code and remove unneed error message about memory allocation.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 97520eaf6ab4c87a0eee912fd4cd99913426d849..ee08cd60cb1fa489e6dc2ab05b79ee59b9c37c92 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 \
@@ -201,6 +200,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 +231,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 = \
@@ -365,16 +368,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) \