lib/media_list: fix sign warnings
[vlc.git] / lib / Makefile.am
index 3d7a68f..e32278a 100644 (file)
@@ -1,5 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
 pkgconfigdir = $(libdir)/pkgconfig
-
 AM_CPPFLAGS = -DMODULE_STRING=\"libvlc\"
 AM_CFLAGS = $(CFLAGS_libvlc)
 
@@ -11,6 +11,7 @@ CLEANFILES = $(BUILT_SOURCES) $(pkgconfig_DATA)
 pkginclude_HEADERS = \
        ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
+       ../include/vlc/libvlc_dialog.h \
        ../include/vlc/libvlc_events.h \
        ../include/vlc/libvlc_media.h \
        ../include/vlc/libvlc_media_discoverer.h \
@@ -18,8 +19,8 @@ pkginclude_HEADERS = \
        ../include/vlc/libvlc_media_list.h \
        ../include/vlc/libvlc_media_list_player.h \
        ../include/vlc/libvlc_media_player.h \
-       ../include/vlc/libvlc_structures.h \
        ../include/vlc/libvlc_vlm.h \
+       ../include/vlc/libvlc_renderer_discoverer.h \
        ../include/vlc/vlc.h
 
 nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h
@@ -32,11 +33,13 @@ lib_LTLIBRARIES = libvlc.la
 
 libvlc_la_SOURCES = \
        libvlc_internal.h \
-       event_internal.h \
        media_internal.h \
        media_list_internal.h \
        media_player_internal.h \
+       renderer_discoverer_internal.h \
        core.c \
+       dialog.c \
+       renderer_discoverer.c \
        error.c \
        log.c \
        playlist.c \
@@ -44,28 +47,29 @@ libvlc_la_SOURCES = \
        video.c \
        audio.c \
        event.c \
-       event_async.c \
        media.c \
        media_player.c \
        media_list.c \
        media_list_path.h \
        media_list_player.c \
        media_library.c \
-       media_discoverer.c \
-       ../src/revision.c
+       media_discoverer.c
 EXTRA_DIST = libvlc.pc.in libvlc.sym ../include/vlc/libvlc_version.h.in
 
-libvlc_la_LIBADD = $(LIBS_libvlc) \
-       ../src/libvlccore.la ../compat/libcompat.la
+libvlc_la_LIBADD = \
+       ../src/libvlccore.la ../compat/libcompat.la $(LIBPTHREAD) $(LIBM)
 libvlc_la_LDFLAGS = \
        $(LDFLAGS_libvlc) \
        -no-undefined \
-       -version-info 6:0:1 \
+       -version-info 10:0:5 \
        -export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym
 if HAVE_WIN32
 libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT)
-libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version
+libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
+endif
+if HAVE_OS2
+libvlc_la_LDFLAGS += -avoid-version
 endif
 
 pkgconfig_DATA = libvlc.pc
@@ -75,4 +79,4 @@ pkgconfig_DATA = libvlc.pc
        $(SHELL) ./config.status --file="lib/$@"
 
 check-local:
-       $(top_srcdir)/src/check_headers $(pkginclude_HEADERS)
+       $(SHELL) $(top_srcdir)/src/check_headers $(pkginclude_HEADERS)