[gedit/wip/use-tagged-entry: 17/19] Add libgd git submodule
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/use-tagged-entry: 17/19] Add libgd git submodule
- Date: Fri, 19 Jul 2013 13:38:38 +0000 (UTC)
commit e47d038299b32c874464ed8ae392b52ecaa24025
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Jul 19 14:59:13 2013 +0200
Add libgd git submodule
.gitmodules | 3 +++
Makefile.am | 4 ++--
configure.ac | 7 +++++++
gedit/Makefile.am | 6 +++++-
libgd | 1 +
5 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index e69de29..303eb9b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+ path = libgd
+ url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index 44ac8a0..25fe07a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-SUBDIRS = gedit pixmaps po plugins data docs tests win32 osx
+SUBDIRS = libgd gedit pixmaps po plugins data docs tests win32 osx
if !OS_OSX
SUBDIRS += help
diff --git a/configure.ac b/configure.ac
index 9fe1297..26f7f54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,6 +358,12 @@ AC_SUBST(GEDIT_CFLAGS)
AC_SUBST(GEDIT_LIBS)
dnl ================================================================
+dnl libgd
+dnl ================================================================
+
+LIBGD_INIT([tagged-entry static])
+
+dnl ================================================================
dnl GSettings stuff
dnl ================================================================
@@ -441,6 +447,7 @@ docs/Makefile
docs/reference/Makefile
gedit/Makefile
help/Makefile
+libgd/Makefile
pixmaps/Makefile
plugins/Makefile
plugins/changecase/Makefile
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 101a97a..9bbb532 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -8,6 +8,7 @@ pkglib_LTLIBRARIES = libgedit-private.la
INCLUDES = \
-I$(top_srcdir) \
-I$(srcdir) \
+ -I$(top_srcdir)/libgd \
$(GEDIT_CFLAGS) \
$(GTK_MAC_CFLAGS) \
$(WARN_CFLAGS) \
@@ -35,7 +36,10 @@ endif
libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
# GEDIT_LIBS must be the last to ensure correct order on some platforms
-libgedit_la_LIBADD = $(GEDIT_LIBS) $(GTK_MAC_LIBS)
+libgedit_la_LIBADD = \
+ $(top_builddir)/libgd/libgd.la \
+ $(GEDIT_LIBS) \
+ $(GTK_MAC_LIBS)
libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..7f08098
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 7f080984bf6a92212def9fb8aa0f6c0f9979b57e
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]