Try to split the mind boggingly big vlm.c

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c866633e260661711cfe2969935b990ec13a9534..aefa6ce3c62ffea47b7ba8b271368eba4cbc91e3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,11 +43,10 @@ pluginsinclude_HEADERS = \
        ../include/vlc_main.h \
        ../include/vlc_messages.h \
        ../include/vlc_modules.h \
-       ../include/vlc_modules_macros.h \
        ../include/vlc_mtime.h \
        ../include/vlc_objects.h \
+       ../include/vlc_plugin.h \
        ../include/vlc_threads.h \
-       ../include/vlc_threads_funcs.h
        ../include/vlc_variables.h \
        $(NULL)
 
@@ -73,6 +72,7 @@ noinst_HEADERS = \
        ../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 \
@@ -85,7 +85,6 @@ noinst_HEADERS = \
        ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
        ../include/vlc_playlist.h \
-       ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
        ../include/vlc_services_discovery.h \
        ../include/vlc_sout.h \
@@ -170,8 +169,11 @@ endif
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
+       -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(pkgdatadir)\" \
+       -DLIBDIR=\"$(libdir)\" \
        -DPLUGIN_PATH=\"$(pkglibdir)\"
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
@@ -188,7 +190,8 @@ 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 libvlc`
+libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DMODULE_STRING=\"control\"
 libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_control_la_LDFLAGS += -export-dynamic
@@ -199,22 +202,33 @@ endif
 EXTRA_libvlc_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
+       $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
+       $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
        $(SOURCES_libvlc_sout) \
        $(NULL)
 if HAVE_BEOS
 libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
-endif
+else
 if HAVE_DARWIN
 libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
-endif
+else
+if HAVE_LINUX
+libvlc_la_SOURCES += $(SOURCES_libvlc_linux)
+else
 if HAVE_WIN32
 libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
-endif
+else
 if HAVE_WINCE
 libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
+else
+libvlc_la_SOURCES += $(SOURCES_libvlc_other)
+endif
+endif
+endif
+endif
 endif
 if BUILD_DIRENT
 libvlc_la_SOURCES += $(SOURCES_libvlc_dirent)
@@ -234,11 +248,17 @@ SOURCES_libvlc_darwin = \
        misc/darwin_specific.c \
        $(NULL)
 
+SOURCES_libvlc_linux = \
+       misc/linux_specific.c \
+       $(NULL)
+
 SOURCES_libvlc_win32 = \
        misc/win32_specific.c \
        network/winsock.c \
        $(NULL)
 
+SOURCES_libvlc_other = misc/not_specific.c
+
 SOURCES_libvlc_dirent = \
        extras/dirent.c \
        $(NULL)
@@ -351,6 +371,7 @@ SOURCES_libvlc_common = \
 
 SOURCES_libvlc_sout = \
        input/vlm.c \
+       input/vlmshell.c \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
        stream_output/announce.c \