X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=5f474be453c86e750188e41cc513a6fa3b773954;hb=d6339e0bfb17513dc877a3ccef52769678e68e4d;hp=987a432a3cebcdd56ac16071789cbaf894aad374;hpb=751d2f1a63d1d4fe2ea19c6b10b176a98bc46615;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 987a432a3c..5f474be453 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,11 +5,16 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+	vlc-control.pc.in \
+	vlc-plugin.pc.in \
+	libvlc.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
+SUFFIXES = .pc.in .pc
+
 ###############################################################################
 # Headers
 ###############################################################################
@@ -18,8 +23,13 @@ pkgincludedir = $(includedir)/vlc
 
 dist_pkginclude_HEADERS = \
 	../include/vlc/vlc.h \
+	../include/vlc/common.h \
+	../include/vlc/deprecated.h \
 	../include/vlc/libvlc.h \
 	../include/vlc/libvlc_structures.h \
+	../include/vlc/libvlc_media_list.h \
+	../include/vlc/libvlc_events.h \
+	../include/vlc/libvlc_vlm.h \
 	../include/vlc/mediacontrol.h \
 	../include/vlc/mediacontrol_structures.h \
 	$(NULL)
@@ -67,7 +77,6 @@ HEADERS_include = \
 	../include/vlc_mtime.h \
 	../include/vlc_network.h \
 	../include/vlc_objects.h \
-	../include/vlc_os_specific.h \
 	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
 	../include/vlc_playlist.h \
@@ -129,6 +138,19 @@ modules/modules.c: modules/builtin.h
 	grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
 	echo ";" >> "$@.tmp"
 	mv -f -- "$@.tmp" "$@"
+
+###############################################################################
+# pkg-config integration
+###############################################################################
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vlc-control.pc vlc-plugin.pc
+CLEANFILES += $(pkgconfig_DATA)
+
+.pc.in.pc: $(top_builddir)/config.status
+	cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="src/$@"
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -145,7 +167,10 @@ endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DDATA_PATH=\"$(pkgdatadir)\" \
+	-DPLUGIN_PATH=\"$(pkglibdir)\"
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
@@ -304,6 +329,7 @@ SOURCES_libvlc_common = \
 	misc/threads.c \
 	misc/stats.c \
 	misc/cpu.c \
+	misc/action.c \
 	config/configuration.h \
 	config/core.c \
 	config/chain.c \
@@ -341,13 +367,12 @@ SOURCES_libvlc_control = \
 	control/vlm.c \
 	control/video.c \
 	control/audio.c \
-	control/dynamic_media_list.c \
 	control/event.c \
 	control/flat_media_list_view.c \
 	control/hierarchical_media_list_view.c \
 	control/hierarchical_node_media_list_view.c \
-	control/media_descriptor.c \
-	control/media_instance.c \
+	control/media.c \
+	control/media_player.c \
 	control/media_list.c \
 	control/media_list_path.h \
 	control/media_list_player.c \
@@ -357,8 +382,7 @@ SOURCES_libvlc_control = \
 	control/mediacontrol_core.c \
 	control/mediacontrol_util.c \
 	control/mediacontrol_audio_video.c \
-	control/media_discoverer.c \
-	control/tag_query.c
+	control/media_discoverer.c
 
 ###############################################################################
 # Stamp rules
@@ -367,14 +391,53 @@ SOURCES_libvlc_control = \
 misc/revision.c:
 	rm -f $@ $@.tmp
 	echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \
+	REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
+	REVISION="$$(echo $$REVISION|cut -b -10)"; \
 	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
 	mv -f $@.tmp $@
 
+
+###############################################################################
+# Building vlc
+###############################################################################
+
+if BUILD_VLC
+bin_PROGRAMS = vlc
+endif
+
+vlc_SOURCES = vlc.c
+vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
+
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
+vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+
+if BUILD_VLC
+vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
+	@rm -f vlc$(EXEEXT)
+	@case `$(VLC_CONFIG) --linkage vlc builtin` in \
+	  c++) cmd="$(CXXLINK)" ;; \
+	  objc) cmd="$(OBJCLINK)" ;; \
+	  c|*) cmd="$(LINK)" ;; \
+	esac ; \
+	cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
+	echo $$cmd ; \
+	eval $$cmd
+
+if HAVE_WIN32
+DATA_win32_rc = $(noinst_DATA)
+noinst_DATA = vlc_win32_rc.$(OBJEXT)
+
+vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc
+	$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(top_srcdir)/share -i $< -o $@
+endif
+endif
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
+	test_dictionary \
 	test_i18n_atof \
 	test_url \
 	test_utf8 \
@@ -387,6 +450,10 @@ TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
+test_dictionary_SOURCES = test/dictionary.c
+test_dictionary_LDADD = libvlc.la
+test_dictionary_CFLAGS = $(CFLAGS_tests)
+
 test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
 test_i18n_atof_LDADD = libvlc.la
 test_i18n_atof_CFLAGS = $(CFLAGS_tests)