X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=973979a93d44d4c69b3b05e5a0ff3d8680ac78b2;hb=1f01a7c64eb1ecd975595736b261fec074fb7116;hp=49b2cb451b8549ad6ec5a37fa45071609aad5f96;hpb=f563f5064dc78d02ff095224b6f7279a072141d8;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 49b2cb451b..973979a93d 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,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 \ @@ -128,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 @@ -154,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/$@" @@ -161,9 +171,6 @@ CLEANFILES += $(pkgconfig_DATA) # Building libvlc ############################################################################### -nice: - $(top_builddir)/compile - lib_LTLIBRARIES = libvlccore.la libvlc.la AM_LDFLAGS = -no-undefined @@ -182,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 \ @@ -195,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) @@ -336,6 +344,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 \ @@ -370,6 +379,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 \ @@ -480,7 +490,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 \ @@ -491,20 +500,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 ############################################################################### @@ -515,19 +516,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; \