Contrib: use the same new headers for NPAPI in Win32

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8468da07b2693fb4acb23f06e4393f29bcf3930e..86d56fb3c123791ddd94d09b426d87b6d48ba73a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,9 +171,6 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 # Building libvlc
 ###############################################################################
 
-nice:
-       $(top_builddir)/compile
-
 lib_LTLIBRARIES = libvlccore.la libvlc.la
 
 AM_LDFLAGS = -no-undefined
@@ -191,12 +188,11 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
-       -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(vlclibdir)/modules\"
+       -DPKGLIBDIR=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 4:0:0
+       -version-info 5:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
        $(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -230,7 +226,6 @@ EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_dirent) \
-       $(SOURCES_libvlc_getopt) \
        $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
        $(SOURCES_libvlc_vlm) \
@@ -259,9 +254,6 @@ endif
 if BUILD_DIRENT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
 endif
-if BUILD_GETOPT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -304,12 +296,6 @@ SOURCES_libvlc_dirent = \
        extras/dirent.c \
        $(NULL)
 
-SOURCES_libvlc_getopt = \
-       extras/getopt.c \
-       extras/getopt.h \
-       extras/getopt1.c \
-       $(NULL)
-
 SOURCES_libvlc_common = \
        libvlc.c \
        libvlc.h \
@@ -346,6 +332,7 @@ SOURCES_libvlc_common = \
        input/es_out_timeshift.c \
        input/event.c \
        input/input.c \
+       input/info.h \
        input/meta.c \
        input/access.h \
        input/clock.h \
@@ -387,6 +374,7 @@ SOURCES_libvlc_common = \
        video_output/vout_intf.c \
        video_output/vout_internal.h \
        video_output/vout_control.h \
+       video_output/vout_wrapper.c \
        audio_output/aout_internal.h \
        audio_output/common.c \
        audio_output/dec.c \
@@ -440,6 +428,8 @@ SOURCES_libvlc_common = \
        config/keys.c \
        config/cmdline.c \
        config/dirs.c \
+       config/getopt.c \
+       config/vlc_getopt.h \
        misc/events.c \
        misc/image.c \
        misc/messages.c \
@@ -483,7 +473,6 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
        $(OPT_SOURCES_libvlc_dirent) \
-       $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
 SOURCES_libvlc_control = \