X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=c2401a3bb7b3429fe63dd6929a4068432c14ee8e;hb=096cd15ea2ce9f4f40a9b4bfe8ddc584536986c7;hp=b07d41b57b797b761a5572f7294ec74c0fcf81f9;hpb=131afa921d56d5f057636374f7a693a79e6f8677;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index b07d41b57b..c2401a3bb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,11 +6,12 @@ AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS = . test
 
 NULL =
-EXTRA_DIST = extras/COPYING \
+EXTRA_DIST = \
 	libvlc.pc.in \
 	vlc-plugin.pc.in \
 	libvlc.sym \
 	libvlccore.sym \
+	revision.txt \
 	../include/vlc/libvlc_version.h.in
 
 BUILT_SOURCES = \
@@ -46,6 +47,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_access.h \
 	../include/vlc_acl.h \
 	../include/vlc_aout.h \
+	../include/vlc_aout_intf.h \
 	../include/vlc_aout_mixer.h \
 	../include/vlc_arrays.h \
 	../include/vlc_art_finder.h \
@@ -71,6 +73,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_fourcc.h \
 	../include/vlc_fs.h \
 	../include/vlc_gcrypt.h \
+	../include/vlc_opengl.h \
 	../include/vlc_http.h \
 	../include/vlc_httpd.h \
 	../include/vlc_image.h \
@@ -108,7 +111,6 @@ pluginsinclude_HEADERS = \
 	../include/vlc_video_splitter.h \
 	../include/vlc_vout.h \
 	../include/vlc_vout_display.h \
-	../include/vlc_vout_opengl.h \
 	../include/vlc_vout_osd.h \
 	../include/vlc_vout_window.h \
 	../include/vlc_xml.h \
@@ -197,19 +199,21 @@ AM_LDFLAGS += -avoid-version
 endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlccore_la_SOURCES = revision.c
-libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
+libvlccore_la_CPPFLAGS = $(INCICONV) \
 	-DMODULE_STRING=\"main\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(vlcdatadir)\" \
 	-DPKGLIBDIR=\"$(vlclibdir)\"
-libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
+libvlccore_la_CFLAGS = $(CFLAGS_libvlccore)
+libvlccore_la_LDFLAGS = $(LDFLAGS_libvlccore) $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
 	-version-info 5:0:0
-libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlccore` $(AM_LIBADD) \
-	$(LTLIBINTL) ../compat/libcompat.la
+libvlccore_la_LIBADD = $(LIBS_libvlccore) \
+	$(LTLIBINTL) $(LTLIBICONV) \
+	$(SOCKET_LIBS) $(LIBDL) $(LIBM) \
+	../compat/libcompat.la
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
@@ -220,17 +224,17 @@ libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
 	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)
-nodist_libvlc_la_SOURCES = revision.c
-libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` \
+libvlc_la_LIBADD = $(LIBS_libvlc) \
 	libvlccore.la ../compat/libcompat.la
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
-libvlc_la_LDFLAGS = $(AM_LDFLAGS) `$(VLC_CONFIG) --ldflags libvlc` \
+libvlc_la_CPPFLAGS = -DMODULE_STRING=\"libvlc\"
+libvlc_la_CFLAGS = $(CFLAGS_libvlc)
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_libvlc) \
 	-version-info 6:0:1 \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 if HAVE_WIN32
-libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib)
-libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib)
+libvlc_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
+libvlc_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
 
@@ -278,6 +282,8 @@ SOURCES_libvlc_darwin = \
 	posix/darwin_dirs.c \
 	misc/atomic.c \
 	posix/filesystem.c \
+	posix/plugin.c \
+	network/poll.c \
 	posix/thread.c \
 	posix/darwin_specific.c \
 	$(NULL)
@@ -286,6 +292,8 @@ SOURCES_libvlc_linux = \
 	posix/dirs.c \
 	misc/atomic.c \
 	posix/filesystem.c \
+	posix/plugin.c \
+	network/poll.c \
 	posix/thread.c \
 	posix/linux_specific.c \
 	$(NULL)
@@ -294,6 +302,8 @@ SOURCES_libvlc_win32 = \
 	win32/dirs.c \
 	win32/atomic.c \
 	win32/filesystem.c \
+	win32/plugin.c \
+	win32/poll.c \
 	win32/thread.c \
 	win32/specific.c \
 	win32/winsock.c \
@@ -303,12 +313,14 @@ SOURCES_libvlc_symbian = \
 	symbian/path.cpp \
 	symbian/dirs.c \
 	misc/atomic.c \
+	win32/plugin.c \
 	$(NULL)
 
 SOURCES_libvlc_other = \
 	posix/dirs.c \
 	misc/atomic.c \
 	posix/filesystem.c \
+	network/poll.c \
 	posix/thread.c \
 	posix/specific.c \
 	$(NULL)
@@ -318,6 +330,7 @@ SOURCES_libvlc_common = \
 	libvlc.h \
 	libvlc-module.c \
 	missing.c \
+	revision.c \
 	version.c \
 	interface/dialog.c \
 	interface/interface.c \
@@ -393,6 +406,7 @@ SOURCES_libvlc_common = \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
 	video_output/window.c \
+	video_output/opengl.c \
 	video_output/vout_intf.c \
 	video_output/vout_internal.h \
 	video_output/vout_control.h \
@@ -414,7 +428,6 @@ SOURCES_libvlc_common = \
 	network/udp.c \
 	network/rootbind.c \
 	network/tls.c \
-	network/poll.c \
 	text/charset.c \
 	text/strings.c \
 	text/unicode.c \
@@ -433,9 +446,9 @@ SOURCES_libvlc_common = \
 	misc/picture_pool.c \
 	modules/modules.h \
 	modules/modules.c \
+	modules/bank.c \
 	modules/cache.c \
 	modules/entry.c \
-	modules/os.c \
 	modules/textdomain.c \
 	misc/threads.c \
 	misc/stats.c \
@@ -446,6 +459,7 @@ SOURCES_libvlc_common = \
 	config/core.c \
 	config/chain.c \
 	config/file.c \
+        config/help.c \
 	config/intf.c \
 	config/keys.c \
 	config/cmdline.c \
@@ -495,11 +509,10 @@ SOURCES_libvlc_vlm = \
 
 SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
-	$(OPT_SOURCES_libvlc_darwin) \
-	$(OPT_SOURCES_libvlc_win32) \
 	$(NULL)
 
 SOURCES_libvlc_control = \
+	revision.c \
 	control/libvlc_internal.h \
 	control/event_internal.h \
 	control/media_internal.h \
@@ -522,54 +535,53 @@ SOURCES_libvlc_control = \
 	control/media_library.c \
 	control/media_discoverer.c
 
+###############################################################################
+# libvlc pulse
+###############################################################################
+
+if HAVE_PULSE
+pkglib_LTLIBRARIES = libvlcpulse.la
+endif
+
+libvlcpulse_la_SOURCES = pulse/mainloop.c ../include/vlc_pulse.h
+libvlcpulse_la_CPPFLAGS = $(PULSE_CFLAGS)
+libvlcpulse_la_LIBADD = $(PULSE_LIBS) libvlccore.la
+libvlcpulse_la_LDFLAGS = -export-symbols-regex ^vlc_pa_ -no-undefined
+
 ###############################################################################
 # GIT revision
 ###############################################################################
 
 BUILT_SOURCES += stamp-revision
-CLEANFILES += revision.txt revision.c
 
-revision.c: revision.txt
-	$(AM_V_at)rm -f -- revision.c
-	$(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat revision.txt)\";" \
-		> revision.c
+$(srcdir)/revision.c: $(srcdir)/revision.txt
+	$(AM_V_at)rm -f -- $@
+	$(AM_V_GEN)echo "const char psz_vlc_changeset[] = \"$$(cat $<)\";" \
+		> $@
 
-revision.txt: Makefile.am
+$(srcdir)/revision.txt:
 	$(AM_V_at)$(MAKE) stamp-revision
-	$(AM_V_GEN)touch revision.txt
+	$(AM_V_GEN)touch $@
 
 stamp-revision:
 	$(AM_V_at)rm -f -- revision.tmp
-	$(AM_V_GEN)(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
-		--match '?.*.*' --always || echo exported) > revision.tmp
-	$(AM_V_at)if diff revision.tmp revision.txt >/dev/null 2>&1; then \
+	$(AM_V_GEN)if ! git \
+			--git-dir="$(top_srcdir)/.git/" describe \
+			--tags --long --match '?.*.*' --always; then \
+		cat $(srcdir)/revision.txt ; \
+	fi > revision.tmp
+	$(AM_V_at)if diff revision.tmp $(srcdir)/revision.txt >/dev/null 2>&1; then \
 		rm -f -- revision.tmp; \
 	else \
-		mv -f -- revision.tmp revision.txt; \
-	fi 2>&1
+		mv -f -- revision.tmp $(srcdir)/revision.txt; \
+	fi
+#2>&1
 
 ###############################################################################
 # Unit/regression test
 ###############################################################################
 
-dist_check_SCRIPTS = check_symbols check_headers
-TESTS = check_symbols
-
-check_DATA = libvlc-headers.sym libvlc-sorted.sym
-CLEANFILES += $(check_DATA)
-
-libvlc-sorted.sym: libvlccore.sym
-	rm -f libvlc-sorted.sym
-	sort -fdu < "$(srcdir)/libvlccore.sym" > libvlc-sorted.sym
-
-libvlc-headers.sym:
-	rm -f libvlc-headers.sym
-	cat ${srcdir}/../include/vlc_*.h ${srcdir}/control/*.h | \
-	sed -n -e 's/^[ ]*VLC_EXPORT[ ]*([^,]*,\([^,]*\),.*/\1/p' | \
-	sed -e 's/[^a-zA-Z0-9_]*//' | \
-	sort -fdu > libvlc-headers.sym
-
-.PHONY: libvlc-headers.sym
+dist_check_SCRIPTS = check_headers
 
 check-local:
 	for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \