fix testapi test: libvlc_instance_(play|pause|stop) are asynchronous, so wait for...

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ff4b1ac30f6980280efbd6e6237e2d5876d19ede..f690d1c2f202817fb01ed008f9c33f2a3055331b 100644 (file)
--- 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)
@@ -134,12 +144,12 @@ modules/modules.c: modules/builtin.h
 ###############################################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vlc-control.pc
+pkgconfig_DATA = vlc-control.pc vlc-plugin.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
+.pc.in.pc: $(top_builddir)/config.status
+       cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
 
 ###############################################################################
 # Building libvlc
@@ -158,7 +168,9 @@ endif
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-       -DDATA_PATH=\"$(pkgdatadir)\"
+       -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) \
@@ -317,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 \
@@ -354,7 +367,6 @@ 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 \
@@ -370,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
@@ -380,7 +391,7 @@ 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 $@
 
@@ -389,8 +400,10 @@ misc/revision.c:
 # Building vlc
 ###############################################################################
 
+if BUILD_VLC
 bin_PROGRAMS = vlc
-# 
+endif
+
 vlc_SOURCES = vlc.c
 vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
 
@@ -398,6 +411,7 @@ 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 \
@@ -410,11 +424,12 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        eval $$cmd
 
 if HAVE_WIN32
-DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
+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 $(srcdir)/share -i $< -o $@
+       $(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
 
 ###############################################################################