X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=b901aa78a11b5e7fcf153126828058d7db69a6ee;hb=82633df33d783add1001bf6a049167308f9e2995;hp=69a516007564a4c833996d43efac5a97477f4a3e;hpb=34e12d626e2cd4d67898328a8d00334ab89d8ebd;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 69a5160075..b901aa78a1 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 misc/revision.c ../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 \ @@ -42,6 +47,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_acl.h \ ../include/vlc_aout.h \ ../include/vlc_arrays.h \ + ../include/vlc_avcodec.h \ ../include/vlc_bits.h \ ../include/vlc_block.h \ ../include/vlc_block_helper.h \ @@ -51,16 +57,19 @@ 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_httpd.h \ ../include/vlc_image.h \ ../include/vlc_input.h \ + ../include/vlc_input_item.h \ ../include/vlc_main.h \ ../include/vlc_md5.h \ ../include/vlc_messages.h \ @@ -68,6 +77,9 @@ pluginsinclude_HEADERS = \ ../include/vlc_modules.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 \ @@ -75,10 +87,12 @@ 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_xml.h \ @@ -102,44 +116,22 @@ noinst_HEADERS = \ ../include/vlc_vod.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" "$@" ############################################################################### @@ -167,20 +159,25 @@ AM_LDFLAGS = -no-undefined if HAVE_WIN32 AM_LDFLAGS += -avoid-version endif +if HAVE_WINCE +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 3: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) @@ -191,11 +188,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 @@ -212,6 +210,7 @@ EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_other) \ $(SOURCES_libvlc_dirent) \ $(SOURCES_libvlc_getopt) \ + $(SOURCES_libvlc_httpd) \ $(SOURCES_libvlc_sout) \ $(SOURCES_libvlc_vlm) \ $(NULL) @@ -242,6 +241,9 @@ endif if BUILD_GETOPT libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt) endif +if BUILD_HTTPD +libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd) +endif if ENABLE_SOUT libvlccore_la_SOURCES += $(SOURCES_libvlc_sout) if ENABLE_VLM @@ -250,22 +252,28 @@ endif endif SOURCES_libvlc_beos = \ + misc/pthread.c \ $(NULL) SOURCES_libvlc_darwin = \ + misc/pthread.c \ misc/darwin_specific.c \ $(NULL) SOURCES_libvlc_linux = \ + misc/pthread.c \ misc/linux_specific.c \ $(NULL) SOURCES_libvlc_win32 = \ + misc/w32thread.c \ misc/win32_specific.c \ network/winsock.c \ $(NULL) -SOURCES_libvlc_other = misc/not_specific.c +SOURCES_libvlc_other = \ + misc/pthread.c \ + misc/not_specific.c SOURCES_libvlc_dirent = \ extras/dirent.c \ @@ -281,17 +289,23 @@ SOURCES_libvlc_common = \ libvlc.c \ libvlc.h \ 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 \ playlist/thread.c \ playlist/control.c \ playlist/engine.c \ + playlist/fetcher.c \ + playlist/fetcher.h \ playlist/sort.c \ playlist/loadsave.c \ + playlist/preparser.c \ + playlist/preparser.h \ playlist/tree.c \ playlist/item.c \ playlist/search.c \ @@ -304,12 +318,29 @@ SOURCES_libvlc_common = \ input/decoder_synchro.c \ input/demux.c \ input/es_out.c \ + input/es_out_timeshift.c \ + input/event.c \ input/input.c \ input/meta.c \ + input/access.h \ + input/clock.h \ + input/decoder.h \ + input/demux.h \ + input/es_out.h \ + input/es_out_timeshift.h \ + input/event.h \ + input/item.h \ + input/stream.h \ input/input_internal.h \ + input/input_interface.h \ input/vlm_internal.h \ + input/vlm_event.h \ + input/resource.h \ + input/resource.c \ input/stream.c \ - input/mem_stream.c \ + input/stream_demux.c \ + input/stream_filter.c \ + input/stream_memory.c \ input/subtitles.c \ input/var.c \ video_output/video_output.c \ @@ -319,6 +350,8 @@ SOURCES_libvlc_common = \ video_output/video_widgets.c \ video_output/vout_subpictures.c \ video_output/vout_intf.c \ + video_output/vout_internal.h \ + video_output/vout_control.h \ audio_output/aout_internal.h \ audio_output/common.c \ audio_output/dec.c \ @@ -335,13 +368,13 @@ SOURCES_libvlc_common = \ network/io.c \ network/tcp.c \ network/udp.c \ - network/httpd.c \ network/rootbind.c \ network/tls.c \ network/poll.c \ text/charset.c \ text/strings.c \ text/unicode.c \ + text/filesystem.c \ text/wincp.c \ text/iso_lang.c \ text/iso-639_def.h \ @@ -349,6 +382,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 \ @@ -378,9 +412,14 @@ SOURCES_libvlc_common = \ misc/xml.c \ misc/devices.c \ extras/libc.c \ + misc/filter.c \ misc/filter_chain.c \ $(NULL) +SOURCES_libvlc_httpd = \ + network/httpd.c \ + $(NULL) + SOURCES_libvlc_sout = \ stream_output/stream_output.c \ stream_output/stream_output.h \ @@ -391,6 +430,7 @@ SOURCES_libvlc_sout = \ SOURCES_libvlc_vlm = \ input/vlm.c \ + input/vlm_event.c \ input/vlmshell.c \ $(NULL) @@ -405,6 +445,11 @@ 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/log.c \ control/playlist.c \ @@ -412,6 +457,7 @@ SOURCES_libvlc_control = \ 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 \ @@ -429,17 +475,27 @@ SOURCES_libvlc_control = \ control/media_discoverer.c ############################################################################### -# Stamp rules +# GIT revision ############################################################################### -misc/revision.c: - rm -f $@ $@.tmp - echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp - REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref --head -s HEAD 2>/dev/null || echo exported)"; \ - REVISION="$$(echo $$REVISION|cut -b -10)"; \ - echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp - mv -f $@.tmp $@ +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)\";" \ + > revision.c + +revision.txt: + $(MAKE) stamp-revision + touch revision.txt + +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 @@ -448,6 +504,22 @@ 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 \