Create 4 common caching parameters (file, capture, disc and network)

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 394d76638253e948072c6eddbfa3c3bd970c48c3..c2401a3bb7b3429fe63dd6929a4068432c14ee8e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -199,18 +199,21 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
+libvlccore_la_CPPFLAGS = $(INCICONV) \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
-libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+libvlccore_la_CFLAGS = $(CFLAGS_libvlccore)
+libvlccore_la_LDFLAGS = $(LDFLAGS_libvlccore) $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
        -version-info 5:0:0
-libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
-       $(LTLIBINTL) ../compat/libcompat.la
+libvlccore_la_LIBADD = $(LIBS_libvlccore) \
+       $(LTLIBINTL) $(LTLIBICONV) \
+       $(SOCKET_LIBS) $(LIBDL) $(LIBM) \
+       ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
@@ -221,10 +224,11 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
+libvlc_la_LIBADD = $(LIBS_libvlc) \
        libvlccore.la ../compat/libcompat.la
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
+libvlc_la_CPPFLAGS = -DMODULE_STRING=\"libvlc\"
+libvlc_la_CFLAGS = $(CFLAGS_libvlc)
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_libvlc) \
        -version-info 6:0:1 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
@@ -279,6 +283,7 @@ SOURCES_libvlc_darwin = \
        misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
+       network/poll.c \
        posix/thread.c \
        posix/darwin_specific.c \
        $(NULL)
@@ -288,6 +293,7 @@ SOURCES_libvlc_linux = \
        misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
+       network/poll.c \
        posix/thread.c \
        posix/linux_specific.c \
        $(NULL)
@@ -297,6 +303,7 @@ SOURCES_libvlc_win32 = \
        win32/atomic.c \
        win32/filesystem.c \
        win32/plugin.c \
+       win32/poll.c \
        win32/thread.c \
        win32/specific.c \
        win32/winsock.c \
@@ -313,6 +320,7 @@ SOURCES_libvlc_other = \
        posix/dirs.c \
        misc/atomic.c \
        posix/filesystem.c \
+       network/poll.c \
        posix/thread.c \
        posix/specific.c \
        $(NULL)
@@ -420,7 +428,6 @@ SOURCES_libvlc_common = \
        network/udp.c \
        network/rootbind.c \
        network/tls.c \
-       network/poll.c \
        text/charset.c \
        text/strings.c \
        text/unicode.c \
@@ -452,6 +459,7 @@ SOURCES_libvlc_common = \
        config/core.c \
        config/chain.c \
        config/file.c \
+        config/help.c \
        config/intf.c \
        config/keys.c \
        config/cmdline.c \
@@ -501,8 +509,6 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
-       $(OPT_SOURCES_libvlc_darwin) \
-       $(OPT_SOURCES_libvlc_win32) \
        $(NULL)
 
 SOURCES_libvlc_control = \