X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=fa26a9d5f21a3cc27933441924f64ea6ef8a0c32;hb=19bed424e1bc4756ae6593e2352b6edd127cefa1;hp=b901aa78a11b5e7fcf153126828058d7db69a6ee;hpb=82633df33d783add1001bf6a049167308f9e2995;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index b901aa78a1..fa26a9d5f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = extras/COPYING \
 BUILT_SOURCES = ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
-SUFFIXES = .pc.in .pc
+SUFFIXES = .pc.in .pc .rc.in .rc
 
 ###############################################################################
 # Headers
@@ -46,7 +46,9 @@ pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
 	../include/vlc_acl.h \
 	../include/vlc_aout.h \
+	../include/vlc_aout_mixer.h \
 	../include/vlc_arrays.h \
+	../include/vlc_art_finder.h \
 	../include/vlc_avcodec.h \
 	../include/vlc_bits.h \
 	../include/vlc_block.h \
@@ -57,6 +59,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_config.h \
 	../include/vlc_config_cat.h \
 	../include/vlc_configuration.h \
+	../include/vlc_cpu.h \
 	../include/vlc_dialog.h \
 	../include/vlc_demux.h \
 	../include/vlc_epg.h \
@@ -66,8 +69,10 @@ pluginsinclude_HEADERS = \
 	../include/vlc_filter.h \
 	../include/vlc_fourcc.h \
 	../include/vlc_gcrypt.h \
+	../include/vlc_http.h \
 	../include/vlc_httpd.h \
 	../include/vlc_image.h \
+	../include/vlc_inhibit.h \
 	../include/vlc_input.h \
 	../include/vlc_input_item.h \
 	../include/vlc_main.h \
@@ -75,6 +80,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_messages.h \
 	../include/vlc_meta.h \
 	../include/vlc_modules.h \
+	../include/vlc_mouse.h \
 	../include/vlc_mtime.h \
 	../include/vlc_objects.h \
 	../include/vlc_picture.h \
@@ -82,8 +88,10 @@ pluginsinclude_HEADERS = \
 	../include/vlc_picture_pool.h \
 	../include/vlc_playlist.h \
 	../include/vlc_plugin.h \
+	../include/vlc_probe.h \
 	../include/vlc_rand.h \
 	../include/vlc_services_discovery.h \
+	../include/vlc_sql.h \
 	../include/vlc_sout.h \
 	../include/vlc_stream.h \
 	../include/vlc_strings.h \
@@ -94,26 +102,29 @@ pluginsinclude_HEADERS = \
 	../include/vlc_vlm.h \
 	../include/vlc_video_splitter.h \
 	../include/vlc_vout.h \
-	../include/vlc_window.h \
+	../include/vlc_vout_display.h \
+	../include/vlc_vout_opengl.h \
+	../include/vlc_vout_window.h \
 	../include/vlc_xml.h \
 	$(NULL)
 
 noinst_HEADERS = \
-	../include/mmx.h \
 	../include/vlc_codec_synchro.h \
 	../include/vlc_codecs.h \
-	../include/vlc_devices.h \
+	../include/vlc_extensions.h \
 	../include/vlc_fixups.h \
 	../include/vlc_interface.h \
 	../include/vlc_intf_strings.h \
 	../include/vlc_iso_lang.h \
 	../include/vlc_keys.h \
+	../include/vlc_memory.h \
 	../include/vlc_network.h \
 	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
 	../include/vlc_tls.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
+	../include/vlc_vout_wrapper.h \
 	$(NULL)
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
@@ -146,6 +157,19 @@ CLEANFILES += $(pkgconfig_DATA)
 	cd "$(top_builddir)" && \
 	$(SHELL) ./config.status --file="src/$@"
 
+##############################################################################
+# Windows resource files
+##############################################################################
+
+if HAVE_WIN32
+noinst_DATA = libvlc_win32_rc.rc
+endif
+EXTRA_DIST += libvlc_win32_rc.rc.in
+
+.rc.in.rc: $(top_builddir)/config.status
+	cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="src/$@"
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -175,7 +199,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 3:0:0
+	-version-info 4:0:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
 	$(LTLIBINTL) ../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
@@ -184,7 +208,7 @@ libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
 libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
-libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
 	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
@@ -256,22 +280,26 @@ SOURCES_libvlc_beos = \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
+	config/dirs_macos.c \
 	misc/pthread.c \
 	misc/darwin_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
+	config/dirs_xdg.c \
 	misc/pthread.c \
 	misc/linux_specific.c \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
-	misc/w32thread.c \
-	misc/win32_specific.c \
-	network/winsock.c \
+	win32/dirs.c \
+	win32/specific.c \
+	win32/thread.c \
+	win32/winsock.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
+	config/dirs_xdg.c \
 	misc/pthread.c \
 	misc/not_specific.c
 
@@ -343,12 +371,21 @@ SOURCES_libvlc_common = \
 	input/stream_memory.c \
 	input/subtitles.c \
 	input/var.c \
+	video_output/display.c \
+	video_output/display.h \
+	video_output/event.h \
+	video_output/inhibit.c \
+	video_output/inhibit.h \
+	video_output/snapshot.c \
+	video_output/snapshot.h \
+	video_output/statistic.h \
 	video_output/video_output.c \
 	video_output/vout_pictures.c \
 	video_output/vout_pictures.h \
 	video_output/video_text.c \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
+	video_output/window.c \
 	video_output/vout_intf.c \
 	video_output/vout_internal.h \
 	video_output/vout_control.h \
@@ -375,31 +412,36 @@ SOURCES_libvlc_common = \
 	text/strings.c \
 	text/unicode.c \
 	text/filesystem.c \
-	text/wincp.c \
 	text/iso_lang.c \
 	text/iso-639_def.h \
 	misc/md5.c \
+	misc/probe.c \
 	misc/rand.c \
 	misc/mtime.c \
 	misc/block.c \
 	misc/fourcc.c \
 	misc/es_format.c \
+	misc/picture_fifo.c \
+	misc/picture_pool.c \
 	modules/modules.h \
 	modules/modules.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 \
 	config/configuration.h \
 	config/core.c \
-	config/dirs.c \
 	config/chain.c \
 	config/file.c \
 	config/intf.c \
+	config/keys.c \
 	config/cmdline.c \
+	config/dirs.c \
 	misc/events.c \
 	misc/image.c \
 	misc/messages.c \
@@ -409,11 +451,14 @@ SOURCES_libvlc_common = \
 	misc/error.c \
 	misc/update.h \
 	misc/update.c \
+	misc/update_crypto.c \
 	misc/xml.c \
-	misc/devices.c \
 	extras/libc.c \
+	extras/tdestroy.c \
 	misc/filter.c \
 	misc/filter_chain.c \
+	misc/http_auth.c \
+	misc/sql.c \
 	$(NULL)
 
 SOURCES_libvlc_httpd = \
@@ -451,6 +496,7 @@ SOURCES_libvlc_control = \
 	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 \
@@ -486,16 +532,19 @@ revision.c: revision.txt
 	echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
 		> revision.c
 
-revision.txt:
+revision.txt: Makefile.am
 	$(MAKE) stamp-revision
 	touch revision.txt
 
 stamp-revision:
 	rm -f -- revision.tmp
 	(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
-		--always || echo exported) > revision.tmp
-	diff revision.tmp revision.txt >/dev/null 2>&1 || \
-	mv -f -- revision.tmp revision.txt
+		--match '?.*.*' --always || echo exported) > revision.tmp
+	if diff revision.tmp revision.txt >/dev/null; then \
+		rm -f -- revision.tmp; \
+	else \
+		mv -f -- revision.tmp revision.txt; \
+	fi 2>&1
 
 ###############################################################################
 # Unit/regression test