X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=ee08cd60cb1fa489e6dc2ab05b79ee59b9c37c92;hb=1b6fc30078a4ab7fdb7a6309743020499c520de9;hp=f3bc01d5cb7ee5e8f3af577c7dfcc740b321ccdb;hpb=b18441e9ec21126aca4b5d38d38c335d0cb47da0;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index f3bc01d5cb..ee08cd60cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+	misc/beos_specific.cpp \
 	libvlc.pc.in \
 	vlc-plugin.pc.in \
 	libvlc.sym \
@@ -95,7 +96,6 @@ noinst_HEADERS = \
 	../include/vlc_network.h \
 	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
-	../include/vlc_streaming.h \
 	../include/vlc_tls.h \
 	../include/vlc_update.h \
 	../include/vlc_vod.h \
@@ -176,11 +176,9 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
 	-DDATA_PATH=\"$(pkgdatadir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPLUGIN_PATH=\"$(pkglibdir)\"
-libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
-libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 0:0:0
+	-version-info 0:1:0
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 
@@ -189,7 +187,7 @@ libvlc_la_LIBADD = libvlccore.la
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
 	-DMODULE_STRING=\"control\"
 libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
-	-version-info 2:0:0 \
+	-version-info 2:1:0 \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 
@@ -202,6 +200,7 @@ EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_dirent) \
 	$(SOURCES_libvlc_getopt) \
 	$(SOURCES_libvlc_sout) \
+	$(SOURCES_libvlc_vlm) \
 	$(NULL)
 if HAVE_BEOS
 libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
@@ -232,10 +231,12 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
 if ENABLE_SOUT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
+if ENABLE_VLM
+libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
+endif
 endif
 
 SOURCES_libvlc_beos = \
-	misc/beos_specific.cpp \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
@@ -367,16 +368,18 @@ SOURCES_libvlc_common = \
 	$(NULL)
 
 SOURCES_libvlc_sout = \
-	input/vlm.c \
-	input/vlmshell.c \
 	stream_output/stream_output.c \
 	stream_output/stream_output.h \
 	stream_output/announce.c \
-	stream_output/profiles.c \
 	stream_output/sap.c \
 	stream_output/sdp.c \
 	$(NULL)
 
+SOURCES_libvlc_vlm = \
+	input/vlm.c \
+	input/vlmshell.c \
+	$(NULL)
+
 SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
 	$(OPT_SOURCES_libvlc_beos) \
@@ -418,7 +421,7 @@ SOURCES_libvlc_control = \
 misc/revision.c:
 	rm -f $@ $@.tmp
 	echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-	REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
+	REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref --head -s HEAD 2>/dev/null || echo exported)"; \
 	REVISION="$$(echo $$REVISION|cut -b -10)"; \
 	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
 	mv -f $@.tmp $@