Obsolete confusing --miface-addr option and rework net_SetMcastOut()

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ae87edb49b02422b36137cd677c5698521cab3b..cd5f5a5f7f1c601ab4f001374b45d9e3e1ebbc50 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
        vlc-plugin.pc.in \
        libvlc.sym \
        libvlccore.sym \
+       revision.txt \
        ../include/vlc/libvlc_version.h.in
 
 BUILT_SOURCES = \
@@ -198,18 +199,17 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlccore_la_SOURCES = revision.c
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
+libvlccore_la_CFLAGS = $(CFLAGS_libvlccore) \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
-libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+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) \
+libvlccore_la_LIBADD = $(LIBS_libvlccore) $(AM_LIBADD) \
        $(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
@@ -221,11 +221,11 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-nodist_libvlc_la_SOURCES = revision.c
-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
@@ -280,6 +280,7 @@ SOURCES_libvlc_darwin = \
        misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
+       network/poll.c \
        posix/thread.c \
        posix/darwin_specific.c \
        $(NULL)
@@ -289,6 +290,7 @@ SOURCES_libvlc_linux = \
        misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
+       network/poll.c \
        posix/thread.c \
        posix/linux_specific.c \
        $(NULL)
@@ -298,6 +300,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 \
@@ -314,6 +317,7 @@ SOURCES_libvlc_other = \
        posix/dirs.c \
        misc/atomic.c \
        posix/filesystem.c \
+       network/poll.c \
        posix/thread.c \
        posix/specific.c \
        $(NULL)
@@ -323,6 +327,7 @@ SOURCES_libvlc_common = \
        libvlc.h \
        libvlc-module.c \
        missing.c \
+       revision.c \
        version.c \
        interface/dialog.c \
        interface/interface.c \
@@ -420,7 +425,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 \
@@ -439,6 +443,7 @@ SOURCES_libvlc_common = \
        misc/picture_pool.c \
        modules/modules.h \
        modules/modules.c \
+       modules/bank.c \
        modules/cache.c \
        modules/entry.c \
        modules/textdomain.c \
@@ -500,11 +505,10 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
-       $(OPT_SOURCES_libvlc_darwin) \
-       $(OPT_SOURCES_libvlc_win32) \
        $(NULL)
 
 SOURCES_libvlc_control = \
+       revision.c \
        control/libvlc_internal.h \
        control/event_internal.h \
        control/media_internal.h \
@@ -545,26 +549,29 @@ libvlcpulse_la_LDFLAGS = -export-symbols-regex ^vlc_pa_ -no-undefined
 ###############################################################################
 
 BUILT_SOURCES += stamp-revision
-CLEANFILES += revision.txt revision.c
 
-revision.c: revision.txt
-       $(AM_V_at)rm -f -- revision.c
-       $(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
-               > revision.c
+$(srcdir)/revision.c: $(srcdir)/revision.txt
+       $(AM_V_at)rm -f -- $@
+       $(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat $<)\";" \
+               > $@
 
-revision.txt: Makefile.am
+$(srcdir)/revision.txt:
        $(AM_V_at)$(MAKE) stamp-revision
-       $(AM_V_GEN)touch revision.txt
+       $(AM_V_GEN)touch $@
 
 stamp-revision:
        $(AM_V_at)rm -f -- revision.tmp
-       $(AM_V_GEN)(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
-               --match '?.*.*' --always || echo exported) > revision.tmp
-       $(AM_V_at)if diff revision.tmp revision.txt >/dev/null 2>&1; then \
+       $(AM_V_GEN)if ! git \
+                       --git-dir="$(top_srcdir)/.git/" describe \
+                       --tags --long --match '?.*.*' --always; then \
+               cat $(srcdir)/revision.txt ; \
+       fi > revision.tmp
+       $(AM_V_at)if diff revision.tmp $(srcdir)/revision.txt >/dev/null 2>&1; then \
                rm -f -- revision.tmp; \
        else \
-               mv -f -- revision.tmp revision.txt; \
-       fi 2>&1
+               mv -f -- revision.tmp $(srcdir)/revision.txt; \
+       fi
+#2>&1
 
 ###############################################################################
 # Unit/regression test