[nautilus] general: Add libgd as a submodule
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] general: Add libgd as a submodule
- Date: Tue, 3 Feb 2015 17:36:16 +0000 (UTC)
commit 86b7e5fb7ba632d6265ae8e43ee290290cfa7212
Author: Carlos Soriano <csoriano gnome org>
Date: Tue Jan 27 14:20:25 2015 +0100
general: Add libgd as a submodule
We will use it for in app notifications.
https://bugzilla.gnome.org/show_bug.cgi?id=743630
.gitmodules | 3 +++
Makefile.am | 3 ++-
autogen.sh | 2 ++
configure.ac | 6 ++++++
libgd | 1 +
src/Makefile.am | 2 ++
6 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..bfd964e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+ path = libgd
+ url = git://git.gnome.org/libgd
diff --git a/Makefile.am b/Makefile.am
index bad8ee2..afeafc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ DIRS = \
eel \
libnautilus-extension \
libnautilus-private \
+ libgd \
src \
test \
po \
@@ -56,6 +57,6 @@ MAINTAINERCLEANFILES = \
DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --enable-gtk-doc
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
index de919b7..795422c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,6 +14,8 @@ PKG_NAME="nautilus"
exit 1
}
+git submodule update --init --recursive
+
which gnome-autogen.sh || {
echo "gnome-autogen.sh not found, you need to install gnome-common"
exit 1
diff --git a/configure.ac b/configure.ac
index 4d29127..fca843c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,6 +308,11 @@ AC_ARG_ENABLE(update-mimedb,
enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+LIBGD_INIT([
+ notification
+ static
+])
+
AC_CONFIG_FILES([
Makefile
data/Makefile
@@ -324,6 +329,7 @@ libnautilus-private/Makefile
libnautilus-extension/Makefile
libnautilus-extension/libnautilus-extension.pc
libnautilus-extension/libnautilus-extension-uninstalled.pc
+libgd/Makefile
po/Makefile.in
src/Makefile
nautilus-sendto-extension/Makefile
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..04b2480
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 04b2480259769709ec34d7ee48294878c94bbbb5
diff --git a/src/Makefile.am b/src/Makefile.am
index d3c88dd..d797d23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ libexec_PROGRAMS= \
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir)/libnautilus-private \
+ -I$(top_srcdir)/libgd \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
$(NAUTILUS_CFLAGS) \
@@ -30,6 +31,7 @@ AM_CPPFLAGS = \
LDADD =\
$(top_builddir)/libnautilus-private/libnautilus-private.la \
+ $(top_builddir)/libgd/libgd.la \
$(BASE_LIBS) \
$(COMMON_LIBS) \
$(NAUTILUS_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]