input: use unsigned atomic value

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a8cecab9fa7a0d3985baedc23c563f161f53fb85..da40d004edddc80533199b7d6141212742568995 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,10 +24,9 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
-       ../include/vlc_acl.h \
        ../include/vlc_aout.h \
        ../include/vlc_aout_intf.h \
-       ../include/vlc_aout_mixer.h \
+       ../include/vlc_aout_volume.h \
        ../include/vlc_arrays.h \
        ../include/vlc_art_finder.h \
        ../include/vlc_atomic.h \
@@ -59,6 +58,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_inhibit.h \
        ../include/vlc_input.h \
        ../include/vlc_input_item.h \
+       ../include/vlc_keys.h \
        ../include/vlc_main.h \
        ../include/vlc_md5.h \
        ../include/vlc_messages.h \
@@ -107,7 +107,6 @@ noinst_HEADERS = \
        ../include/vlc_interface.h \
        ../include/vlc_intf_strings.h \
        ../include/vlc_iso_lang.h \
-       ../include/vlc_keys.h \
        ../include/vlc_memory.h \
        ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
@@ -165,11 +164,11 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 
 lib_LTLIBRARIES = libvlccore.la
 
-AM_CPPFLAGS = $(INCICONV) \
+AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
-       -DDATA_PATH=\"$(vlcdatadir)\" \
+       -DPKGDATADIR=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)
 
@@ -183,7 +182,7 @@ libvlccore_la_LDFLAGS = \
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
        ../compat/libcompat.la \
        $(LTLIBINTL) $(LTLIBICONV) \
-       $(SOCKET_LIBS) $(LIBDL) $(LIBM)
+       $(IDN_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
@@ -240,20 +239,20 @@ endif
 
 SOURCES_libvlc_darwin = \
        posix/darwin_dirs.c \
-       misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
        posix/thread.c \
+       posix/timer.c \
        posix/darwin_specific.c \
        posix/rand.c \
        $(NULL)
 
 SOURCES_libvlc_linux = \
        posix/dirs.c \
-       misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
        posix/thread.c \
+       posix/timer.c \
        posix/linux_cpu.c \
        posix/linux_specific.c \
        posix/specific.c \
@@ -262,7 +261,6 @@ SOURCES_libvlc_linux = \
 
 SOURCES_libvlc_win32 = \
        win32/dirs.c \
-       win32/atomic.c \
        win32/filesystem.c \
        win32/plugin.c \
        win32/thread.c \
@@ -274,7 +272,6 @@ SOURCES_libvlc_win32 = \
 SOURCES_libvlc_symbian = \
        symbian/path.cpp \
        symbian/dirs.c \
-       misc/atomic.c \
        win32/plugin.c \
        posix/rand.c \
        $(NULL)
@@ -282,9 +279,8 @@ SOURCES_libvlc_symbian = \
 SOURCES_libvlc_os2 = \
        os2/getaddrinfo.c \
        os2/dirs.c \
-       misc/atomic.c \
-       posix/filesystem.c \
-       posix/plugin.c \
+       os2/filesystem.c \
+       os2/plugin.c \
        os2/thread.c \
        os2/specific.c \
        os2/rand.c \
@@ -292,9 +288,9 @@ SOURCES_libvlc_os2 = \
 
 SOURCES_libvlc_other = \
        posix/dirs.c \
-       misc/atomic.c \
        posix/filesystem.c \
        posix/thread.c \
+       posix/timer.c \
        posix/plugin.c \
        posix/specific.c \
        posix/rand.c \
@@ -391,12 +387,11 @@ SOURCES_libvlc_common = \
        audio_output/dec.c \
        audio_output/filters.c \
        audio_output/input.c \
-       audio_output/mixer.c \
        audio_output/output.c \
+       audio_output/volume.c \
        audio_output/intf.c \
        osd/osd.c \
        osd/osd_text.c \
-       network/acl.c \
        network/getaddrinfo.c \
        network/io.c \
        network/tcp.c \
@@ -406,6 +401,7 @@ SOURCES_libvlc_common = \
        text/charset.c \
        text/strings.c \
        text/unicode.c \
+       text/url.c \
        text/filesystem.c \
        text/iso_lang.c \
        text/iso-639_def.h \
@@ -437,7 +433,6 @@ SOURCES_libvlc_common = \
        config/intf.c \
        config/keys.c \
        config/cmdline.c \
-       config/dirs.c \
        config/getopt.c \
        config/vlc_getopt.h \
        misc/events.c \