Always build and use "our" getopt

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c4c86fc3c014022b8c932fe5d165459a5791bc68..c265d6d622faf4c87a5d02f3179320110a645ddf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,12 +34,9 @@ pkginclude_HEADERS = \
        ../include/vlc/libvlc_media_library.h \
        ../include/vlc/libvlc_media_list.h \
        ../include/vlc/libvlc_media_list_player.h \
-       ../include/vlc/libvlc_media_list_view.h \
        ../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 = \
@@ -68,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 \
@@ -173,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
@@ -194,7 +189,8 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(vlclibdir)\"
+       -DPKGLIBDIR=\"$(vlclibdir)\" \
+       -DPLUGIN_PATH=PKGLIBDIR\"/modules\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
@@ -232,7 +228,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) \
@@ -261,9 +256,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
@@ -306,12 +298,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 \
@@ -348,6 +334,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 \
@@ -382,6 +369,7 @@ SOURCES_libvlc_common = \
        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 \
@@ -458,6 +446,9 @@ SOURCES_libvlc_common = \
        misc/filter_chain.c \
        misc/http_auth.c \
        misc/sql.c \
+       extras/getopt.c \
+       extras/getopt.h \
+       extras/getopt1.c \
        $(NULL)
 
 SOURCES_libvlc_httpd = \
@@ -484,7 +475,6 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_darwin) \
        $(OPT_SOURCES_libvlc_win32) \
        $(OPT_SOURCES_libvlc_dirent) \
-       $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
 SOURCES_libvlc_control = \
@@ -492,7 +482,6 @@ SOURCES_libvlc_control = \
        control/event_internal.h \
        control/media_internal.h \
        control/media_list_internal.h \
-       control/media_list_view_internal.h \
        control/media_player_internal.h \
        control/core.c \
        control/error.c \
@@ -503,20 +492,12 @@ SOURCES_libvlc_control = \
        control/audio.c \
        control/event.c \
        control/event_async.c \
-       control/flat_media_list_view.c \
-       control/hierarchical_media_list_view.c \
-       control/hierarchical_node_media_list_view.c \
        control/media.c \
        control/media_player.c \
        control/media_list.c \
        control/media_list_path.h \
        control/media_list_player.c \
-       control/media_list_view.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
 
 ###############################################################################