Add optional first arg to specify contrib directory.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0ec0b8421d4c92c3b85de76acbd4f50083f3b3b7..bd81fe4096e26c1df7439f05c9bed971eae67c61 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,8 +37,6 @@ pkginclude_HEADERS = \
        ../include/vlc/libvlc_media_player.h \
        ../include/vlc/libvlc_structures.h \
        ../include/vlc/libvlc_vlm.h \
-       ../include/vlc/mediacontrol.h \
-       ../include/vlc/mediacontrol_structures.h \
        $(NULL)
 
 pluginsinclude_HEADERS = \
@@ -67,6 +65,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_events.h \
        ../include/vlc_filter.h \
        ../include/vlc_fourcc.h \
+       ../include/vlc_fs.h \
        ../include/vlc_gcrypt.h \
        ../include/vlc_http.h \
        ../include/vlc_httpd.h \
@@ -92,9 +91,11 @@ pluginsinclude_HEADERS = \
        ../include/vlc_services_discovery.h \
        ../include/vlc_sql.h \
        ../include/vlc_sout.h \
+       ../include/vlc_spu.h \
        ../include/vlc_stream.h \
        ../include/vlc_strings.h \
        ../include/vlc_subpicture.h \
+       ../include/vlc_text_style.h \
        ../include/vlc_threads.h \
        ../include/vlc_url.h \
        ../include/vlc_variables.h \
@@ -103,6 +104,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_vout.h \
        ../include/vlc_vout_display.h \
        ../include/vlc_vout_opengl.h \
+       ../include/vlc_vout_osd.h \
        ../include/vlc_vout_window.h \
        ../include/vlc_xml.h \
        $(NULL)
@@ -172,9 +174,6 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 # Building libvlc
 ###############################################################################
 
-nice:
-       $(top_builddir)/compile
-
 lib_LTLIBRARIES = libvlccore.la libvlc.la
 
 AM_LDFLAGS = -no-undefined
@@ -192,12 +191,11 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
-       -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(vlclibdir)\"
+       -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
@@ -231,7 +229,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) \
@@ -260,9 +257,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
@@ -305,12 +299,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 \
@@ -347,6 +335,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 \
@@ -369,24 +358,33 @@ SOURCES_libvlc_common = \
        input/stream_memory.c \
        input/subtitles.c \
        input/var.c \
+       video_output/chrono.h \
+       video_output/control.c \
+       video_output/control.h \
        video_output/display.c \
        video_output/display.h \
        video_output/event.h \
        video_output/inhibit.c \
        video_output/inhibit.h \
+       video_output/interlacing.c \
+       video_output/interlacing.h \
        video_output/snapshot.c \
        video_output/snapshot.h \
        video_output/statistic.h \
+       video_output/postprocessing.c \
+       video_output/postprocessing.h \
        video_output/video_output.c \
        video_output/vout_pictures.c \
        video_output/vout_pictures.h \
        video_output/video_text.c \
+       video_output/video_epg.c \
        video_output/video_widgets.c \
        video_output/vout_subpictures.c \
        video_output/window.c \
        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 +438,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 +483,6 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
        $(OPT_SOURCES_libvlc_dirent) \
-       $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
 SOURCES_libvlc_control = \
@@ -507,10 +506,6 @@ SOURCES_libvlc_control = \
        control/media_list_path.h \
        control/media_list_player.c \
        control/media_library.c \
-       control/mediacontrol_internal.h \
-       control/mediacontrol_core.c \
-       control/mediacontrol_util.c \
-       control/mediacontrol_audio_video.c \
        control/media_discoverer.c
 
 ###############################################################################