X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=c59d7dc5a3c29df8cffee0e42eea0fa583f45a71;hb=1374daaa71c4210f2ddab92617cc296f6cbc6542;hp=1663b86a9cfd234978a652928fab8a41bd8669c6;hpb=c438a0104bf3a549b326c172b39dc5e2d9ab6573;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 1663b86a9c..c59d7dc5a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = extras/COPYING modules/builtin.h.in \
 	libvlc.sym \
 	libvlccore.sym
 
-BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
+BUILT_SOURCES = modules/builtin.h ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
 SUFFIXES = .pc.in .pc
@@ -61,6 +61,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 \
@@ -167,6 +168,9 @@ 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
@@ -292,11 +296,17 @@ SOURCES_libvlc_common = \
 	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 \
@@ -309,6 +319,8 @@ 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 \
@@ -316,10 +328,18 @@ SOURCES_libvlc_common = \
 	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/ressource.h \
+	input/ressource.c \
 	input/stream.c \
+	input/stream_demux.c \
+	input/stream_filter.c \
 	input/stream_memory.c \
 	input/subtitles.c \
 	input/var.c \
@@ -354,6 +374,7 @@ SOURCES_libvlc_common = \
 	text/charset.c \
 	text/strings.c \
 	text/unicode.c \
+	text/filesystem.c \
 	text/wincp.c \
 	text/iso_lang.c \
 	text/iso-639_def.h \
@@ -448,13 +469,21 @@ SOURCES_libvlc_control = \
 # 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:
-	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 $@
+	$(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