X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=2d922baa891bfb2deb28fc2a8a121cb596784643;hb=d2d62531e689b20176d57fd122db06d4656a4180;hp=c59d7dc5a3c29df8cffee0e42eea0fa583f45a71;hpb=4d802e182e835fef96ad7e6c0c5fbd155054b9c5;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index c59d7dc5a3..2d922baa89 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,14 +6,14 @@ AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = . test NULL = -EXTRA_DIST = extras/COPYING modules/builtin.h.in \ +EXTRA_DIST = extras/COPYING \ misc/beos_specific.cpp \ libvlc.pc.in \ vlc-plugin.pc.in \ libvlc.sym \ libvlccore.sym -BUILT_SOURCES = modules/builtin.h ../include/vlc_about.h +BUILT_SOURCES = ../include/vlc_about.h CLEANFILES = $(BUILT_SOURCES) SUFFIXES = .pc.in .pc @@ -22,16 +22,21 @@ SUFFIXES = .pc.in .pc # Headers ############################################################################### -pkgincludedir = $(includedir)/vlc pluginsincludedir = $(pkgincludedir)/plugins pkginclude_HEADERS = \ ../include/vlc/vlc.h \ ../include/vlc/deprecated.h \ ../include/vlc/libvlc.h \ - ../include/vlc/libvlc_structures.h \ - ../include/vlc/libvlc_media_list.h \ ../include/vlc/libvlc_events.h \ + ../include/vlc/libvlc_media.h \ + ../include/vlc/libvlc_media_discoverer.h \ + ../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 \ @@ -41,7 +46,10 @@ pluginsinclude_HEADERS = \ ../include/vlc_access.h \ ../include/vlc_acl.h \ ../include/vlc_aout.h \ + ../include/vlc_aout_mixer.h \ ../include/vlc_arrays.h \ + ../include/vlc_art_finder.h \ + ../include/vlc_avcodec.h \ ../include/vlc_bits.h \ ../include/vlc_block.h \ ../include/vlc_block_helper.h \ @@ -51,13 +59,16 @@ pluginsinclude_HEADERS = \ ../include/vlc_config.h \ ../include/vlc_config_cat.h \ ../include/vlc_configuration.h \ + ../include/vlc_dialog.h \ ../include/vlc_demux.h \ ../include/vlc_epg.h \ ../include/vlc_es.h \ ../include/vlc_es_out.h \ ../include/vlc_events.h \ ../include/vlc_filter.h \ + ../include/vlc_fourcc.h \ ../include/vlc_gcrypt.h \ + ../include/vlc_http.h \ ../include/vlc_httpd.h \ ../include/vlc_image.h \ ../include/vlc_input.h \ @@ -67,8 +78,12 @@ pluginsinclude_HEADERS = \ ../include/vlc_messages.h \ ../include/vlc_meta.h \ ../include/vlc_modules.h \ + ../include/vlc_mouse.h \ ../include/vlc_mtime.h \ ../include/vlc_objects.h \ + ../include/vlc_picture.h \ + ../include/vlc_picture_fifo.h \ + ../include/vlc_picture_pool.h \ ../include/vlc_playlist.h \ ../include/vlc_plugin.h \ ../include/vlc_rand.h \ @@ -76,12 +91,15 @@ pluginsinclude_HEADERS = \ ../include/vlc_sout.h \ ../include/vlc_stream.h \ ../include/vlc_strings.h \ + ../include/vlc_subpicture.h \ ../include/vlc_threads.h \ ../include/vlc_url.h \ ../include/vlc_variables.h \ ../include/vlc_vlm.h \ + ../include/vlc_video_splitter.h \ ../include/vlc_vout.h \ - ../include/vlc_window.h \ + ../include/vlc_vout_display.h \ + ../include/vlc_vout_window.h \ ../include/vlc_xml.h \ $(NULL) @@ -101,46 +119,25 @@ noinst_HEADERS = \ ../include/vlc_tls.h \ ../include/vlc_update.h \ ../include/vlc_vod.h \ + ../include/vlc_vout_wrapper.h \ $(NULL) -modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am - rm -f -- "$@.tmp" - cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp" -if !HAVE_PLUGINS - plugins="$$($(VLC_CONFIG) --list plugin)" ; \ - test -n "$${plugins}" && \ - for p in $${plugins}; do \ - echo "int vlc_entry__$$p (module_t *);" ; \ - done >> "$@.tmp" -endif - echo "#define ALLOCATE_ALL_BUILTINS() \\" >> "$@.tmp" - echo " do \\" >> "$@.tmp" - echo " { \\" >> "$@.tmp" -if !HAVE_PLUGINS - plugins="$$($(VLC_CONFIG) --list plugin)" ; \ - test -n "$${plugins}" && \ - for p in $${plugins}; do \ - echo " ALLOCATE_BUILTIN($$p); \\" ; \ - done >> "$@.tmp" -endif - echo ' } while( 0 );' >> "$@.tmp" - mv -f -- "$@.tmp" "$@" - -modules/modules.c: modules/builtin.h - ../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" - cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp" + sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" >> "$@.tmp" echo ";" >> "$@.tmp" echo "static const char psz_thanks[] =" >> "$@.tmp" - grep -v '$$Id:' $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp" + sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \ + "$(top_srcdir)/THANKS" >> "$@.tmp" echo ";" >> "$@.tmp" echo "static const char psz_authors[] =" >> "$@.tmp" - grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp" + sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \ + "$(top_srcdir)/AUTHORS" >> "$@.tmp" echo ";" >> "$@.tmp" + mv -f -- "$@.tmp" "$@" ############################################################################### @@ -173,18 +170,20 @@ AM_LDFLAGS += -avoid-version endif libvlccore_la_SOURCES = $(SOURCES_libvlc) -nodist_libvlccore_la_SOURCES = misc/revision.c -libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ +nodist_libvlccore_la_SOURCES = revision.c +libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \ -DMODULE_STRING=\"main\" \ -DLOCALEDIR=\"$(localedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DDATA_PATH=\"$(pkgdatadir)\" \ + -DDATA_PATH=\"$(vlcdatadir)\" \ -DLIBDIR=\"$(libdir)\" \ - -DPLUGIN_PATH=\"$(pkglibdir)\" -libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ + -DPLUGIN_PATH=\"$(vlclibdir)\" +libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ + -no-undefined \ -export-symbols $(srcdir)/libvlccore.sym \ - -version-info 1:0:0 -libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) + -version-info 4:0:0 +libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \ + $(LTLIBINTL) ../compat/libcompat.la libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) @@ -195,11 +194,12 @@ libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ libvlc_la_SOURCES = $(SOURCES_libvlc_control) -libvlc_la_LIBADD = libvlccore.la -libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ - -DMODULE_STRING=\"control\" -libvlc_la_LDFLAGS = $(AM_LDFLAGS) \ - -version-info 2:2:0 \ +nodist_libvlc_la_SOURCES = revision.c +libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \ + libvlccore.la ../compat/libcompat.la +libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` +libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \ + -version-info 5:0:0 \ -export-symbols $(srcdir)/libvlc.sym libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la if HAVE_WIN32 @@ -258,22 +258,32 @@ endif endif SOURCES_libvlc_beos = \ + misc/pthread.c \ $(NULL) SOURCES_libvlc_darwin = \ + config/dirs_macos.c \ + misc/pthread.c \ misc/darwin_specific.c \ $(NULL) SOURCES_libvlc_linux = \ + config/dirs_xdg.c \ + misc/pthread.c \ misc/linux_specific.c \ $(NULL) SOURCES_libvlc_win32 = \ + config/dirs_win.c \ + misc/w32thread.c \ misc/win32_specific.c \ network/winsock.c \ $(NULL) -SOURCES_libvlc_other = misc/not_specific.c +SOURCES_libvlc_other = \ + config/dirs_xdg.c \ + misc/pthread.c \ + misc/not_specific.c SOURCES_libvlc_dirent = \ extras/dirent.c \ @@ -291,10 +301,9 @@ SOURCES_libvlc_common = \ libvlc-module.c \ missing.c \ version.c \ - interface/interface.h \ + interface/dialog.c \ interface/interface.c \ interface/intf_eject.c \ - interface/interaction.c \ playlist/playlist_internal.h \ playlist/art.c \ playlist/art.h \ @@ -335,20 +344,28 @@ SOURCES_libvlc_common = \ input/input_internal.h \ input/input_interface.h \ input/vlm_internal.h \ - input/ressource.h \ - input/ressource.c \ + input/vlm_event.h \ + input/resource.h \ + input/resource.c \ input/stream.c \ input/stream_demux.c \ input/stream_filter.c \ input/stream_memory.c \ input/subtitles.c \ input/var.c \ + video_output/display.c \ + video_output/display.h \ + video_output/event.h \ + video_output/snapshot.c \ + video_output/snapshot.h \ + video_output/statistic.h \ video_output/video_output.c \ video_output/vout_pictures.c \ video_output/vout_pictures.h \ video_output/video_text.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 \ @@ -382,6 +399,7 @@ SOURCES_libvlc_common = \ misc/rand.c \ misc/mtime.c \ misc/block.c \ + misc/fourcc.c \ misc/es_format.c \ modules/modules.h \ modules/modules.c \ @@ -394,7 +412,6 @@ SOURCES_libvlc_common = \ misc/action.c \ config/configuration.h \ config/core.c \ - config/dirs.c \ config/chain.c \ config/file.c \ config/intf.c \ @@ -408,10 +425,13 @@ SOURCES_libvlc_common = \ misc/error.c \ misc/update.h \ misc/update.c \ + misc/update_crypto.c \ misc/xml.c \ misc/devices.c \ extras/libc.c \ + misc/filter.c \ misc/filter_chain.c \ + misc/http_auth.c \ $(NULL) SOURCES_libvlc_httpd = \ @@ -428,6 +448,7 @@ SOURCES_libvlc_sout = \ SOURCES_libvlc_vlm = \ input/vlm.c \ + input/vlm_event.c \ input/vlmshell.c \ $(NULL) @@ -442,13 +463,20 @@ SOURCES_libvlc = \ SOURCES_libvlc_control = \ control/libvlc_internal.h \ + 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 \ control/log.c \ control/playlist.c \ control/vlm.c \ control/video.c \ 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 \ @@ -466,24 +494,27 @@ SOURCES_libvlc_control = \ control/media_discoverer.c ############################################################################### -# Stamp rules +# GIT revision ############################################################################### -misc/revision.c.tmp: - rm -f -- $@ - echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@ - REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo "$(VERSION)")"; \ - echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@ - diff $@ misc/revision.c >/dev/null 2>&1 || \ - cat misc/revision.c.tmp > misc/revision.c +BUILT_SOURCES += stamp-revision +CLEANFILES += revision.txt revision.c -misc/revision.c: - $(MAKE) misc/revision.c.tmp - cat misc/revision.c.tmp > misc/revision.c +revision.c: revision.txt + rm -f -- revision.c + echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ + > revision.c -BUILT_SOURCES += misc/revision.c.tmp misc/revision.c +revision.txt: + $(MAKE) stamp-revision + touch revision.txt -.PHONY: misc/revision.c.tmp +stamp-revision: + rm -f -- revision.tmp + (git --git-dir="$(top_srcdir)/.git/" describe --tags --long \ + --always || echo exported) > revision.tmp + diff revision.tmp revision.txt >/dev/null 2>&1 || \ + mv -f -- revision.tmp revision.txt ############################################################################### # Unit/regression test @@ -492,6 +523,22 @@ BUILT_SOURCES += misc/revision.c.tmp misc/revision.c dist_check_SCRIPTS = check_symbols check_headers TESTS = check_symbols +check_DATA = libvlc-headers.sym libvlc-sorted.sym +CLEANFILES += $(check_DATA) + +libvlc-sorted.sym: libvlccore.sym + rm -f libvlc-sorted.sym + sort -fdu < "$(srcdir)/libvlccore.sym" > libvlc-sorted.sym + +libvlc-headers.sym: + rm -f libvlc-headers.sym + cat ${srcdir}/../include/vlc_*.h ${srcdir}/control/*.h | \ + sed -n -e 's/^[ ]*VLC_EXPORT[ ]*([^,]*,\([^,]*\),.*/\1/p' | \ + sed -e 's/[^a-zA-Z0-9_]*//' | \ + sort -fdu > libvlc-headers.sym + +.PHONY: libvlc-headers.sym + check-local: for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \ do \