input: use unsigned atomic value

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a64f891bc53e00f76a70d3600bb9529798322554..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)
 
@@ -181,9 +180,9 @@ libvlccore_la_LDFLAGS = \
        -export-symbols $(srcdir)/libvlccore.sym \
        -version-info 5:0:0
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
+       ../compat/libcompat.la \
        $(LTLIBINTL) $(LTLIBICONV) \
-       $(SOCKET_LIBS) $(LIBDL) $(LIBM) \
-       ../compat/libcompat.la
+       $(IDN_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
@@ -191,7 +190,7 @@ libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
 endif
 
 libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
-       $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+       $(WINDRES) --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
 
 EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_darwin) \
@@ -240,58 +239,61 @@ endif
 
 SOURCES_libvlc_darwin = \
        posix/darwin_dirs.c \
-       misc/atomic.c \
        posix/filesystem.c \
        posix/plugin.c \
-       network/poll.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 \
-       network/poll.c \
        posix/thread.c \
+       posix/timer.c \
+       posix/linux_cpu.c \
        posix/linux_specific.c \
+       posix/specific.c \
+       posix/rand.c \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
        win32/dirs.c \
-       win32/atomic.c \
        win32/filesystem.c \
        win32/plugin.c \
-       win32/poll.c \
        win32/thread.c \
        win32/specific.c \
        win32/winsock.c \
+       win32/rand.c \
        $(NULL)
 
 SOURCES_libvlc_symbian = \
        symbian/path.cpp \
        symbian/dirs.c \
-       misc/atomic.c \
        win32/plugin.c \
+       posix/rand.c \
        $(NULL)
 
 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 \
        $(NULL)
 
 SOURCES_libvlc_other = \
        posix/dirs.c \
-       misc/atomic.c \
        posix/filesystem.c \
-       network/poll.c \
        posix/thread.c \
+       posix/timer.c \
+       posix/plugin.c \
        posix/specific.c \
+       posix/rand.c \
        $(NULL)
 
 SOURCES_libvlc_common = \
@@ -303,7 +305,6 @@ SOURCES_libvlc_common = \
        version.c \
        interface/dialog.c \
        interface/interface.c \
-       interface/intf_eject.c \
        playlist/playlist_internal.h \
        playlist/art.c \
        playlist/art.h \
@@ -348,6 +349,7 @@ SOURCES_libvlc_common = \
        input/vlm_event.h \
        input/resource.h \
        input/resource.c \
+       input/stats.c \
        input/stream.c \
        input/stream_demux.c \
        input/stream_filter.c \
@@ -385,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 \
@@ -400,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 \
@@ -420,7 +422,6 @@ SOURCES_libvlc_common = \
        modules/entry.c \
        modules/textdomain.c \
        misc/threads.c \
-       misc/stats.c \
        misc/cpu.c \
        misc/epg.c \
        misc/exit.c \
@@ -432,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 \
@@ -526,7 +526,7 @@ check-local:
                        exit 1; \
                fi ; \
        done
-       $(srcdir)/check_headers $(pluginsinclude_HEADERS)
+       $(SHELL) $(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
        @echo "Generated source cannot be phony. Go away." >&2