X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=eabdb6c90945e2388c2a8ffc8ff4fa11b24f8358;hb=086a3600d6ba6fc7d9b44cbb42d37a5572102854;hp=48fda22c835b7e38e6fe7052ba4b3558609c297a;hpb=56ba662f7b1b02335e28ef47401463ae4cc7bb38;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 48fda22c83..eabdb6c909 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,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
@@ -167,19 +144,21 @@ 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` \
 	-DMODULE_STRING=\"main\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATA_PATH=\"$(pkgdatadir)\" \
+	-DDATA_PATH=\"$(vlcdatadir)\" \
 	-DLIBDIR=\"$(libdir)\" \
-	-DPLUGIN_PATH=\"$(pkglibdir)\"
+	-DPLUGIN_PATH=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 1:0:0
+	-version-info 2:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
@@ -195,7 +174,7 @@ 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 \
+	-version-info 4:0:2 \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
@@ -287,16 +266,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 +304,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 \
@@ -413,6 +403,7 @@ SOURCES_libvlc_sout = \
 
 SOURCES_libvlc_vlm = \
 	input/vlm.c \
+	input/vlm_event.c \
 	input/vlmshell.c \
 	$(NULL)
 
@@ -450,18 +441,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
 ###############################################################################