X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=c265d6d622faf4c87a5d02f3179320110a645ddf;hb=b3a59c07e71c74191c2d1524dbd2f5412dd762db;hp=5ceb0d1e6a66ae1084b73302dbb3ade4946b28a0;hpb=2f6053d68f73fda8f96e3d03a88296aa6874e5e8;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 5ceb0d1e6a..c265d6d622 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = extras/COPYING \ BUILT_SOURCES = ../include/vlc_about.h CLEANFILES = $(BUILT_SOURCES) -SUFFIXES = .pc.in .pc +SUFFIXES = .pc.in .pc .rc.in .rc ############################################################################### # Headers @@ -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,10 +65,12 @@ 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 \ ../include/vlc_image.h \ + ../include/vlc_inhibit.h \ ../include/vlc_input.h \ ../include/vlc_input_item.h \ ../include/vlc_main.h \ @@ -87,6 +86,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_picture_pool.h \ ../include/vlc_playlist.h \ ../include/vlc_plugin.h \ + ../include/vlc_probe.h \ ../include/vlc_rand.h \ ../include/vlc_services_discovery.h \ ../include/vlc_sql.h \ @@ -101,19 +101,21 @@ pluginsinclude_HEADERS = \ ../include/vlc_video_splitter.h \ ../include/vlc_vout.h \ ../include/vlc_vout_display.h \ + ../include/vlc_vout_opengl.h \ ../include/vlc_vout_window.h \ ../include/vlc_xml.h \ $(NULL) noinst_HEADERS = \ - ../include/mmx.h \ ../include/vlc_codec_synchro.h \ ../include/vlc_codecs.h \ + ../include/vlc_extensions.h \ ../include/vlc_fixups.h \ ../include/vlc_interface.h \ ../include/vlc_intf_strings.h \ ../include/vlc_iso_lang.h \ ../include/vlc_keys.h \ + ../include/vlc_memory.h \ ../include/vlc_network.h \ ../include/vlc_osd.h \ ../include/vlc_pgpkey.h \ @@ -124,22 +126,21 @@ noinst_HEADERS = \ $(NULL) ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS - rm -f -- "$@.tmp" - mkdir -p -- ../include - echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp" - echo "static const char psz_license[] =" >> "$@.tmp" - sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" >> "$@.tmp" - echo ";" >> "$@.tmp" - echo "static const char psz_thanks[] =" >> "$@.tmp" + $(AM_V_at)rm -f -- "$@.tmp" + $(AM_V_at)mkdir -p -- ../include + $(AM_V_GEN)(echo "/* Automatically generated file - DO NOT EDIT */" && \ + echo "static const char psz_license[] =" && \ + sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" && \ + echo ";" && \ + echo "static const char psz_thanks[] =" && \ sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \ - "$(top_srcdir)/THANKS" >> "$@.tmp" - echo ";" >> "$@.tmp" - echo "static const char psz_authors[] =" >> "$@.tmp" + "$(top_srcdir)/THANKS" && \ + echo ";" && \ + echo "static const char psz_authors[] =" && \ sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \ - "$(top_srcdir)/AUTHORS" >> "$@.tmp" - echo ";" >> "$@.tmp" - - mv -f -- "$@.tmp" "$@" + "$(top_srcdir)/AUTHORS" && \ + echo ";") >> "$@.tmp" + $(AM_V_at)mv -f -- "$@.tmp" "$@" ############################################################################### # pkg-config integration @@ -150,6 +151,19 @@ pkgconfig_DATA = libvlc.pc vlc-plugin.pc CLEANFILES += $(pkgconfig_DATA) .pc.in.pc: $(top_builddir)/config.status + $(AM_V_GEN)cd "$(top_builddir)" && \ + $(SHELL) ./config.status --file="src/$@" + +############################################################################## +# Windows resource files +############################################################################## + +if HAVE_WIN32 +noinst_DATA = libvlc_win32_rc.rc +endif +EXTRA_DIST += libvlc_win32_rc.rc.in + +.rc.in.rc: $(top_builddir)/config.status cd "$(top_builddir)" && \ $(SHELL) ./config.status --file="src/$@" @@ -157,9 +171,6 @@ CLEANFILES += $(pkgconfig_DATA) # Building libvlc ############################################################################### -nice: - $(top_builddir)/compile - lib_LTLIBRARIES = libvlccore.la libvlc.la AM_LDFLAGS = -no-undefined @@ -178,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 \ @@ -191,7 +203,7 @@ libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) endif -libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc +libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ libvlc_la_SOURCES = $(SOURCES_libvlc_control) @@ -216,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) \ @@ -245,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 @@ -275,10 +283,10 @@ SOURCES_libvlc_linux = \ $(NULL) SOURCES_libvlc_win32 = \ - config/dirs_win.c \ - misc/w32thread.c \ - misc/win32_specific.c \ - network/winsock.c \ + win32/dirs.c \ + win32/specific.c \ + win32/thread.c \ + win32/winsock.c \ $(NULL) SOURCES_libvlc_other = \ @@ -290,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 \ @@ -332,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 \ @@ -357,6 +360,8 @@ SOURCES_libvlc_common = \ video_output/display.c \ video_output/display.h \ video_output/event.h \ + video_output/inhibit.c \ + video_output/inhibit.h \ video_output/snapshot.c \ video_output/snapshot.h \ video_output/statistic.h \ @@ -364,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 \ @@ -393,10 +399,10 @@ SOURCES_libvlc_common = \ text/strings.c \ text/unicode.c \ text/filesystem.c \ - text/wincp.c \ text/iso_lang.c \ text/iso-639_def.h \ misc/md5.c \ + misc/probe.c \ misc/rand.c \ misc/mtime.c \ misc/block.c \ @@ -409,6 +415,7 @@ SOURCES_libvlc_common = \ modules/cache.c \ modules/entry.c \ modules/os.c \ + modules/textdomain.c \ misc/threads.c \ misc/stats.c \ misc/cpu.c \ @@ -421,6 +428,7 @@ SOURCES_libvlc_common = \ config/intf.c \ config/keys.c \ config/cmdline.c \ + config/dirs.c \ misc/events.c \ misc/image.c \ misc/messages.c \ @@ -433,10 +441,14 @@ SOURCES_libvlc_common = \ misc/update_crypto.c \ misc/xml.c \ extras/libc.c \ + extras/tdestroy.c \ misc/filter.c \ misc/filter_chain.c \ misc/http_auth.c \ misc/sql.c \ + extras/getopt.c \ + extras/getopt.h \ + extras/getopt1.c \ $(NULL) SOURCES_libvlc_httpd = \ @@ -463,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 = \ @@ -471,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 \ @@ -482,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 ############################################################################### @@ -506,19 +508,19 @@ BUILT_SOURCES += stamp-revision CLEANFILES += revision.txt revision.c revision.c: revision.txt - rm -f -- revision.c - echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ + $(AM_V_at)rm -f -- revision.c + $(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ > revision.c revision.txt: Makefile.am - $(MAKE) stamp-revision - touch revision.txt + $(AM_V_at)$(MAKE) stamp-revision + $(AM_V_GEN)touch revision.txt stamp-revision: - rm -f -- revision.tmp - (git --git-dir="$(top_srcdir)/.git/" describe --tags --long \ + $(AM_V_at)rm -f -- revision.tmp + $(AM_V_GEN)(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \ --match '?.*.*' --always || echo exported) > revision.tmp - if diff revision.tmp revision.txt >/dev/null; then \ + $(AM_V_at)if diff revision.tmp revision.txt >/dev/null 2>&1; then \ rm -f -- revision.tmp; \ else \ mv -f -- revision.tmp revision.txt; \