X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=290ff2c4c32f92a9b90b91808cfedff3b9c74997;hb=6452698b9a24b07df260464c6f5eb635b0d2e4d9;hp=48fda22c835b7e38e6fe7052ba4b3558609c297a;hpb=56ba662f7b1b02335e28ef47401463ae4cc7bb38;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 48fda22c83..290ff2c4c3 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,22 @@ 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_list.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 +48,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 +58,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 +78,7 @@ pluginsinclude_HEADERS = \ ../include/vlc_modules.h \ ../include/vlc_mtime.h \ ../include/vlc_objects.h \ + ../include/vlc_picture.h \ ../include/vlc_playlist.h \ ../include/vlc_plugin.h \ ../include/vlc_rand.h \ @@ -75,6 +86,7 @@ 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 \ @@ -102,31 +114,6 @@ 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 @@ -167,20 +154,24 @@ 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` \ +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 +182,11 @@ 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 \ +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 @@ -254,22 +245,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 \ @@ -287,16 +284,21 @@ 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 \ 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 \ @@ -320,11 +322,17 @@ SOURCES_libvlc_common = \ 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/stream_demux.c \ + input/stream_filter.c \ input/stream_memory.c \ input/subtitles.c \ input/var.c \ @@ -367,6 +375,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 \ @@ -413,6 +422,7 @@ SOURCES_libvlc_sout = \ SOURCES_libvlc_vlm = \ input/vlm.c \ + input/vlm_event.c \ input/vlmshell.c \ $(NULL) @@ -427,6 +437,10 @@ SOURCES_libvlc = \ SOURCES_libvlc_control = \ control/libvlc_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 \ @@ -450,18 +464,6 @@ SOURCES_libvlc_control = \ control/mediacontrol_audio_video.c \ control/media_discoverer.c -############################################################################### -# Stamp rules -############################################################################### - -misc/revision.c: - rm -f -- $@ $@.tmp - echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp - REVISION="$$(cd "$(top_srcdir)"; git describe 2>/dev/null || echo exported)"; \ - echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp - mv -f -- $@.tmp $@ - - ############################################################################### # Unit/regression test ###############################################################################