[gnome-font-viewer] Remove libgd submodule
- From: Yosef Or Boczko <yoseforb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-font-viewer] Remove libgd submodule
- Date: Wed, 3 Jul 2013 07:45:21 +0000 (UTC)
commit a79847084d743c8245fe2b33993e3c321472ecd1
Author: Yosef Or Boczko <yoseforb gmail com>
Date: Tue Jul 2 09:56:13 2013 +0300
Remove libgd submodule
.gitmodules | 3 ---
Makefile.am | 4 +---
autogen.sh | 3 ---
configure.ac | 5 -----
libgd | 1 -
src/Makefile.am | 4 +---
6 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index caac60b..dd6709f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1 @@
-ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-
-SUBDIRS = libgd src po
+SUBDIRS = src po
diff --git a/autogen.sh b/autogen.sh
index a0b5dc6..79caedd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,6 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="GNOME Font Viewer"
-ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
(test -f $srcdir/configure.ac \
&& test -f $srcdir/src/font-view.c) || {
@@ -19,6 +18,4 @@ which gnome-autogen.sh || {
exit 1
}
-git submodule update --init --recursive
-
USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index f6dee6b..7aa6cae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,13 +47,8 @@ PKG_CHECK_MODULES(FONTVIEW,
glib-2.0 >= $GLIB_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION)
-LIBGD_INIT([
- static
-])
-
AC_CONFIG_FILES([
Makefile
-libgd/Makefile
src/Makefile
src/gnome-font-viewer.desktop.in
po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index d03e6cc..b17ef3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,7 @@
AM_CPPFLAGS = \
$(FONTVIEW_CFLAGS) \
-DDIRECTORY_DIR=\"$(directorydir)\" \
- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -I$(top_srcdir)/libgd
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = \
gnome-thumbnail-font \
@@ -35,7 +34,6 @@ gnome_thumbnail_font_SOURCES = \
gnome_font_viewer_LDADD = \
-lm \
- $(top_builddir)/libgd/libgd.la \
$(FONTVIEW_LIBS)
gnome_font_viewer_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]