X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=3210814858e25d948affc0a0b2a3de336b7ba22d;hb=6fcdfb046a1ad84620628cadef3375b2434c0085;hp=83a09f7f685a2f1a65aa60210c642640902aeb93;hpb=e9a932b5b096a93a4635eeb834dd37d074ee27dc;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 83a09f7f68..3210814858 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,14 +6,12 @@ AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = . test NULL = -EXTRA_DIST = extras/COPYING \ - misc/beos_specific.cpp \ - libvlc.pc.in \ +EXTRA_DIST = \ vlc-plugin.pc.in \ - libvlc.sym \ - libvlccore.sym + libvlccore.sym \ + revision.txt -BUILT_SOURCES = ../include/vlc_about.h +BUILT_SOURCES = $(nodist_pluginsinclude_HEADERS) CLEANFILES = $(BUILT_SOURCES) SUFFIXES = .pc.in .pc .rc.in .rc @@ -24,31 +22,15 @@ SUFFIXES = .pc.in .pc .rc.in .rc pluginsincludedir = $(pkgincludedir)/plugins -pkginclude_HEADERS = \ - ../include/vlc/vlc.h \ - ../include/vlc/deprecated.h \ - ../include/vlc/libvlc.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 \ - $(NULL) - pluginsinclude_HEADERS = \ ../include/vlc_access.h \ ../include/vlc_acl.h \ ../include/vlc_aout.h \ + ../include/vlc_aout_intf.h \ ../include/vlc_aout_mixer.h \ ../include/vlc_arrays.h \ ../include/vlc_art_finder.h \ + ../include/vlc_atomic.h \ ../include/vlc_avcodec.h \ ../include/vlc_bits.h \ ../include/vlc_block.h \ @@ -68,7 +50,9 @@ pluginsinclude_HEADERS = \ ../include/vlc_events.h \ ../include/vlc_filter.h \ ../include/vlc_fourcc.h \ + ../include/vlc_fs.h \ ../include/vlc_gcrypt.h \ + ../include/vlc_opengl.h \ ../include/vlc_http.h \ ../include/vlc_httpd.h \ ../include/vlc_image.h \ @@ -79,6 +63,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_md5.h \ ../include/vlc_messages.h \ ../include/vlc_meta.h \ + ../include/vlc_media_library.h \ ../include/vlc_modules.h \ ../include/vlc_mouse.h \ ../include/vlc_mtime.h \ @@ -93,9 +78,11 @@ pluginsinclude_HEADERS = \ ../include/vlc_services_discovery.h \ ../include/vlc_sql.h \ ../include/vlc_sout.h \ + ../include/vlc_spu.h \ ../include/vlc_stream.h \ ../include/vlc_strings.h \ ../include/vlc_subpicture.h \ + ../include/vlc_text_style.h \ ../include/vlc_threads.h \ ../include/vlc_url.h \ ../include/vlc_variables.h \ @@ -103,10 +90,12 @@ pluginsinclude_HEADERS = \ ../include/vlc_video_splitter.h \ ../include/vlc_vout.h \ ../include/vlc_vout_display.h \ - ../include/vlc_vout_opengl.h \ + ../include/vlc_vout_osd.h \ ../include/vlc_vout_window.h \ ../include/vlc_xml.h \ + ../include/vlc_xlib.h \ $(NULL) +nodist_pluginsinclude_HEADERS = ../include/vlc_about.h noinst_HEADERS = \ ../include/vlc_codec_synchro.h \ @@ -125,36 +114,36 @@ noinst_HEADERS = \ ../include/vlc_update.h \ ../include/vlc_vod.h \ ../include/vlc_vout_wrapper.h \ + ../include/vlc_windows_interfaces.h \ $(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" - sed -n '/^N: /{;s///;s/"/\\"/g;s/^.*$$/\"&\\n\"/;p;}' \ - "$(top_srcdir)/AUTHORS" >> "$@.tmp" - echo ";" >> "$@.tmp" - - mv -f -- "$@.tmp" "$@" + "$(top_srcdir)/THANKS" && \ + echo ";" && \ + echo "static const char psz_authors[] =" && \ + sed '/\$$Id:/d;s/"/\\"/g;s/<.*.> //;s/^.*$$/\"&\\n\"/' \ + "$(top_srcdir)/AUTHORS" && \ + echo ";") >> "$@.tmp" + $(AM_V_at)mv -f -- "$@.tmp" "$@" ############################################################################### # pkg-config integration ############################################################################### pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libvlc.pc vlc-plugin.pc +pkgconfig_DATA = vlc-plugin.pc CLEANFILES += $(pkgconfig_DATA) .pc.in.pc: $(top_builddir)/config.status - cd "$(top_builddir)" && \ + $(AM_V_GEN)cd "$(top_builddir)" && \ $(SHELL) ./config.status --file="src/$@" ############################################################################## @@ -174,73 +163,45 @@ EXTRA_DIST += libvlc_win32_rc.rc.in # Building libvlc ############################################################################### -nice: - $(top_builddir)/compile - -lib_LTLIBRARIES = libvlccore.la libvlc.la - -AM_LDFLAGS = -no-undefined -if HAVE_WIN32 -AM_LDFLAGS += -avoid-version -endif -if HAVE_WINCE -AM_LDFLAGS += -avoid-version -endif +lib_LTLIBRARIES = libvlccore.la -libvlccore_la_SOURCES = $(SOURCES_libvlc) -nodist_libvlccore_la_SOURCES = revision.c -libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \ +AM_CPPFLAGS = $(INCICONV) \ -DMODULE_STRING=\"main\" \ -DLOCALEDIR=\"$(localedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DDATA_PATH=\"$(vlcdatadir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DPLUGIN_PATH=\"$(vlclibdir)\" -libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ + -DPKGLIBDIR=\"$(vlclibdir)\" +AM_CFLAGS = $(CFLAGS_libvlccore) + +libvlccore_la_SOURCES = $(SOURCES_libvlc) +libvlccore_la_LDFLAGS = \ + -no-undefined \ + $(LDFLAGS_libvlccore) \ -no-undefined \ -export-symbols $(srcdir)/libvlccore.sym \ - -version-info 4:0:0 -libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \ - $(LTLIBINTL) ../compat/libcompat.la + -version-info 5:0:0 +libvlccore_la_LIBADD = $(LIBS_libvlccore) \ + $(LTLIBINTL) $(LTLIBICONV) \ + $(SOCKET_LIBS) $(LIBDL) $(LIBM) \ + ../compat/libcompat.la libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) -libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) +libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version endif libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ -libvlc_la_SOURCES = $(SOURCES_libvlc_control) -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 -libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib) -libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib) -endif - - EXTRA_libvlccore_la_SOURCES = \ - $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_linux) \ $(SOURCES_libvlc_win32) \ $(SOURCES_libvlc_other) \ - $(SOURCES_libvlc_dirent) \ - $(SOURCES_libvlc_getopt) \ $(SOURCES_libvlc_httpd) \ $(SOURCES_libvlc_sout) \ $(SOURCES_libvlc_vlm) \ $(NULL) -if HAVE_BEOS -libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) -else if HAVE_DARWIN libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin) else @@ -253,18 +214,15 @@ else if HAVE_WINCE libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) else +if HAVE_SYMBIAN +#libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian) +else libvlccore_la_SOURCES += $(SOURCES_libvlc_other) endif endif endif endif 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,42 +233,51 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm) endif endif -SOURCES_libvlc_beos = \ - misc/pthread.c \ - $(NULL) - SOURCES_libvlc_darwin = \ - config/dirs_macos.c \ - misc/pthread.c \ - misc/darwin_specific.c \ + posix/darwin_dirs.c \ + misc/atomic.c \ + posix/filesystem.c \ + posix/plugin.c \ + network/poll.c \ + posix/thread.c \ + posix/darwin_specific.c \ $(NULL) SOURCES_libvlc_linux = \ - config/dirs_xdg.c \ - misc/pthread.c \ - misc/linux_specific.c \ + posix/dirs.c \ + misc/atomic.c \ + posix/filesystem.c \ + posix/plugin.c \ + network/poll.c \ + posix/thread.c \ + posix/linux_specific.c \ $(NULL) SOURCES_libvlc_win32 = \ win32/dirs.c \ - win32/specific.c \ + win32/atomic.c \ + win32/filesystem.c \ + win32/plugin.c \ + win32/poll.c \ win32/thread.c \ + win32/specific.c \ win32/winsock.c \ $(NULL) -SOURCES_libvlc_other = \ - config/dirs_xdg.c \ - misc/pthread.c \ - misc/not_specific.c - -SOURCES_libvlc_dirent = \ - extras/dirent.c \ +SOURCES_libvlc_symbian = \ + symbian/path.cpp \ + symbian/dirs.c \ + misc/atomic.c \ + win32/plugin.c \ $(NULL) -SOURCES_libvlc_getopt = \ - extras/getopt.c \ - extras/getopt.h \ - extras/getopt1.c \ +SOURCES_libvlc_other = \ + posix/dirs.c \ + misc/atomic.c \ + posix/filesystem.c \ + network/poll.c \ + posix/thread.c \ + posix/specific.c \ $(NULL) SOURCES_libvlc_common = \ @@ -318,6 +285,7 @@ SOURCES_libvlc_common = \ libvlc.h \ libvlc-module.c \ missing.c \ + revision.c \ version.c \ interface/dialog.c \ interface/interface.c \ @@ -349,6 +317,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 \ @@ -371,24 +340,32 @@ SOURCES_libvlc_common = \ input/stream_memory.c \ input/subtitles.c \ input/var.c \ + video_output/chrono.h \ + video_output/control.c \ + video_output/control.h \ video_output/display.c \ video_output/display.h \ video_output/event.h \ video_output/inhibit.c \ video_output/inhibit.h \ + video_output/interlacing.c \ + video_output/interlacing.h \ video_output/snapshot.c \ video_output/snapshot.h \ video_output/statistic.h \ + video_output/postprocessing.c \ + video_output/postprocessing.h \ video_output/video_output.c \ - 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 \ + video_output/opengl.c \ video_output/vout_intf.c \ video_output/vout_internal.h \ video_output/vout_control.h \ + video_output/vout_wrapper.c \ audio_output/aout_internal.h \ audio_output/common.c \ audio_output/dec.c \ @@ -399,7 +376,6 @@ SOURCES_libvlc_common = \ audio_output/intf.c \ osd/osd.c \ osd/osd_text.c \ - osd/osd_widgets.c \ network/acl.c \ network/getaddrinfo.c \ network/io.c \ @@ -407,7 +383,6 @@ SOURCES_libvlc_common = \ network/udp.c \ network/rootbind.c \ network/tls.c \ - network/poll.c \ text/charset.c \ text/strings.c \ text/unicode.c \ @@ -421,27 +396,31 @@ SOURCES_libvlc_common = \ misc/block.c \ misc/fourcc.c \ misc/es_format.c \ + misc/picture.c \ misc/picture_fifo.c \ misc/picture_pool.c \ modules/modules.h \ modules/modules.c \ + modules/bank.c \ modules/cache.c \ modules/entry.c \ - modules/os.c \ modules/textdomain.c \ misc/threads.c \ misc/stats.c \ misc/cpu.c \ - misc/action.c \ misc/epg.c \ + misc/exit.c \ config/configuration.h \ config/core.c \ config/chain.c \ config/file.c \ + config/help.c \ config/intf.c \ config/keys.c \ config/cmdline.c \ config/dirs.c \ + config/getopt.c \ + config/vlc_getopt.h \ misc/events.c \ misc/image.c \ misc/messages.c \ @@ -453,12 +432,16 @@ SOURCES_libvlc_common = \ misc/update.c \ misc/update_crypto.c \ misc/xml.c \ + misc/media_library.c \ extras/libc.c \ extras/tdestroy.c \ misc/filter.c \ misc/filter_chain.c \ misc/http_auth.c \ misc/sql.c \ + misc/text_style.c \ + misc/subpicture.c \ + misc/subpicture.h \ $(NULL) SOURCES_libvlc_httpd = \ @@ -481,93 +464,55 @@ SOURCES_libvlc_vlm = \ SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ - $(OPT_SOURCES_libvlc_beos) \ - $(OPT_SOURCES_libvlc_darwin) \ - $(OPT_SOURCES_libvlc_win32) \ - $(OPT_SOURCES_libvlc_dirent) \ - $(OPT_SOURCES_libvlc_getopt) \ $(NULL) -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 \ - 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 +############################################################################### +# libvlc pulse +############################################################################### + +if HAVE_PULSE +pkglib_LTLIBRARIES = libvlcpulse.la +endif + +libvlcpulse_la_SOURCES = pulse/mainloop.c ../include/vlc_pulse.h +libvlcpulse_la_CPPFLAGS = $(PULSE_CFLAGS) +libvlcpulse_la_LIBADD = $(PULSE_LIBS) libvlccore.la +libvlcpulse_la_LDFLAGS = -export-symbols-regex ^vlc_pa_ -no-undefined ############################################################################### # GIT revision ############################################################################### BUILT_SOURCES += stamp-revision -CLEANFILES += revision.txt revision.c -revision.c: revision.txt - $(AM_V_at)rm -f -- revision.c - $(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \ - > revision.c +$(srcdir)/revision.c: $(srcdir)/revision.txt + $(AM_V_at)rm -f -- $@ + $(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat $<)\";" \ + > $@ -revision.txt: Makefile.am +$(srcdir)/revision.txt: $(AM_V_at)$(MAKE) stamp-revision - $(AM_V_GEN)touch revision.txt + $(AM_V_GEN)touch $@ stamp-revision: $(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 - $(AM_V_at)if diff revision.tmp revision.txt >/dev/null 2>&1; then \ + $(AM_V_GEN)if ! git \ + --git-dir="$(top_srcdir)/.git/" describe \ + --tags --long --match '?.*.*' --always; then \ + cat $(srcdir)/revision.txt ; \ + fi > revision.tmp + $(AM_V_at)if diff revision.tmp $(srcdir)/revision.txt >/dev/null 2>&1; then \ rm -f -- revision.tmp; \ else \ - mv -f -- revision.tmp revision.txt; \ - fi 2>&1 + mv -f -- revision.tmp $(srcdir)/revision.txt; \ + fi +#2>&1 ############################################################################### # Unit/regression test ############################################################################### -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 +dist_check_SCRIPTS = check_headers check-local: for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \ @@ -579,7 +524,6 @@ check-local: exit 1; \ fi ; \ done - $(srcdir)/check_headers $(pkginclude_HEADERS) $(srcdir)/check_headers $(pluginsinclude_HEADERS) FORCE: