some more cleanup

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b167dba8865d3e9470584b89e05d0a89579baf1b..983e1fab96bf49581d9c63d0379eddade42a1083 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 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)
@@ -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
 ###############################################################################
@@ -368,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_share_vlc_win32_rc_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 \
@@ -388,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)