X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=059b4d43541d513b659544cdd713eded09722b3c;hb=0c88710e2ccac34ffb971a3531584d0cbd3d739a;hp=78c73d9fb55595d26721543303ae9202b693676b;hpb=eac4e0c9a52d197f1313b12097a4d8065c513222;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 78c73d9fb5..059b4d4354 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,7 +22,6 @@ SUFFIXES = .pc.in .pc # Headers ############################################################################### -pkgincludedir = $(includedir)/vlc pluginsincludedir = $(pkgincludedir)/plugins pkginclude_HEADERS = \ @@ -42,6 +41,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,6 +51,7 @@ 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 \ @@ -61,6 +62,7 @@ pluginsinclude_HEADERS = \ ../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 \ @@ -102,31 +104,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 @@ -172,18 +149,19 @@ 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 2: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) @@ -194,11 +172,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 4:0:2 \ -export-symbols $(srcdir)/libvlc.sym libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la if HAVE_WIN32 @@ -290,10 +268,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 \ @@ -334,8 +311,9 @@ 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 \ @@ -427,6 +405,7 @@ SOURCES_libvlc_sout = \ SOURCES_libvlc_vlm = \ input/vlm.c \ + input/vlm_event.c \ input/vlmshell.c \ $(NULL) @@ -464,26 +443,6 @@ SOURCES_libvlc_control = \ control/mediacontrol_audio_video.c \ control/media_discoverer.c -############################################################################### -# Stamp rules -############################################################################### - -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 - -misc/revision.c: - $(MAKE) misc/revision.c.tmp - cat misc/revision.c.tmp > misc/revision.c - -BUILT_SOURCES += misc/revision.c.tmp misc/revision.c - -.PHONY: misc/revision.c.tmp - ############################################################################### # Unit/regression test ###############################################################################