[aravis] build: fix parallel installation for gettext and gstreamer plugin.



commit 302fb5f48d803c6101409fe11900e16bd73369b9
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Apr 18 10:33:35 2011 +0200

    build: fix parallel installation for gettext and gstreamer plugin.

 configure.ac    |    3 +--
 gst/Makefile.am |   14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2146a8d..6fdf84f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,7 @@ AC_PROG_CC
 
 AC_HEADER_STDC
 
-GETTEXT_PACKAGE=aravis
-AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST(GETTEXT_PACKAGE, aravis-${ARAVIS_API_VERSION}$)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.31.2])
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 0b78d4e..895dd0b 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -15,15 +15,15 @@ AM_CFLAGS =\
 
 if ARAVIS_WITH_GSTREAMER
 
-gstplugin_LTLIBRARIES = libgstaravis.la
+gstplugin_LTLIBRARIES = libgstaravis- ARAVIS_API_VERSION@.la
 
-libgstaravis_la_SOURCES = gstaravis.c gstaravis.h
-libgstaravis_la_CFLAGS = $(ARAVIS_EXTRA_CFLAGS)
-libgstaravis_la_LIBADD = $(ARAVIS_EXTRA_LIBS)
-libgstaravis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaravis_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaravis_ ARAVIS_API_VERSION@_la_SOURCES = gstaravis.c gstaravis.h
+libgstaravis_ ARAVIS_API_VERSION@_la_CFLAGS = $(ARAVIS_EXTRA_CFLAGS)
+libgstaravis_ ARAVIS_API_VERSION@_la_LIBADD = $(ARAVIS_EXTRA_LIBS)
+libgstaravis_ ARAVIS_API_VERSION@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstaravis_ ARAVIS_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static
 
-libgstaravis_ladir = $(includedir)/aravis
+libgstaravis_ ARAVIS_API_VERSION@_ladir = $(includedir)/aravis- ARAVIS_API_VERSION@
 
 noinst_HEADERS = gstaravis.h
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]