[totem] build: Add libgd submodule to the build
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] build: Add libgd submodule to the build
- Date: Thu, 13 Dec 2012 13:11:52 +0000 (UTC)
commit ccce60da8053d624f32680fb84d49ba01df5be62
Author: Bastien Nocera <hadess hadess net>
Date: Wed Dec 12 14:07:06 2012 +0100
build: Add libgd submodule to the build
.gitmodules | 3 +++
Makefile.am | 5 +++--
autogen.sh | 4 ++++
configure.ac | 7 +++++++
libgd | 1 +
5 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..303eb9b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+ path = libgd
+ url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index 162671c..f2efdb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+
+NORMAL_SUBDIRS = libgd po data help src docs
-NORMAL_SUBDIRS = po data help src docs
SUBDIRS = $(NORMAL_SUBDIRS)
if ENABLE_BROWSER_PLUGINS
diff --git a/autogen.sh b/autogen.sh
index f7acd22..0f5f57b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="totem"
+ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -12,6 +13,9 @@ PKG_NAME="totem"
exit 1
}
+echo "+ Setting up submodules"
+git submodule update --init --recursive
+
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME SVN"
exit 1
diff --git a/configure.ac b/configure.ac
index 9a085de..2bdbf37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,6 +308,12 @@ PKG_CHECK_MODULES(THUMBNAILER, gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PL
PKG_CHECK_MODULES(PREVIEW, gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0)
PKG_CHECK_MODULES(PROPERTIES, gtk+-3.0 >= $GTK_REQS)
+LIBGD_INIT([
+ tagged-entry
+ static
+ ])
+
+
dnl ================================================================
dnl Vala plugins
dnl ================================================================
@@ -717,6 +723,7 @@ AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
Makefile
totem.spec
+libgd/Makefile
src/Makefile
src/gst/Makefile
src/properties/Makefile
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..aee0c36
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit aee0c3673117e39e0da6f56f4146b7a1d6fb1685
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]