X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=a813e72f941c37ad3a03362873e59fe25ae5576b;hb=a21959aff9fc4595d6d82867447889ee2c862b40;hp=502ab2bce82093a1adea6a0044935d3c05aa7a90;hpb=3edce1dc6f2d1ba9a76a434eaad142706e08add0;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 502ab2bce8..a813e72f94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,10 +5,10 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym vlc-control.pc.in
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
-CLEANFILES = $(BUILT_SOURCES) libvlc.sym
+CLEANFILES = $(BUILT_SOURCES)
 
 ###############################################################################
 # Headers
@@ -67,7 +67,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 +128,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
+CLEANFILES += $(pkgconfig_DATA)
+
+vlc-control.pc: vlc-control.pc.in $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	$(SHELL) ./config.status --file=src/vlc-control.pc
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -145,7 +157,8 @@ 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` \
+	-DDATA_PATH=\"$(pkgdatadir)\"
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
@@ -367,14 +380,48 @@ 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) | cut -b -10)"; \
 	echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
 	mv -f $@.tmp $@
 
+
+###############################################################################
+# Building vlc
+###############################################################################
+
+bin_PROGRAMS = vlc
+# 
+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`
+
+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
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
+	test_dictionary \
 	test_i18n_atof \
 	test_url \
 	test_utf8 \
@@ -387,6 +434,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)