[baobab/wip/gtkmaster] Remove libgd submodule.



commit ea6a607febe5fa212bf19c7d1278e68dbaf7b121
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jun 2 12:28:55 2013 +0200

    Remove libgd submodule.

 .gitmodules                 |    3 ---
 Makefile.am                 |    2 +-
 configure.ac                |    6 ------
 libgd                       |    1 -
 src/Makefile.am             |    6 +-----
 src/baobab-application.vala |    2 --
 6 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 0ec7a39..f8c6a2b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "libgd"]
-       path = libgd
-       url = ../libgd
 [submodule "egg-list-box"]
        path = egg-list-box
        url = ../egg-list-box
diff --git a/Makefile.am b/Makefile.am
index 5d49380..ac14ae3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 NULL =
 
 SUBDIRS =  libgd src data pixmaps help po
diff --git a/configure.ac b/configure.ac
index 5585993..f7e3d58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,18 +50,12 @@ PKG_CHECK_MODULES(BAOBAB, [
 
 LT_INIT([disable-static])
 
-LIBGD_INIT([
-    static
-    vapi
-])
-
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
 help/Makefile
 pixmaps/Makefile
 src/Makefile
-libgd/Makefile
 po/Makefile.in
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ef1b45..53041e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,11 +11,9 @@ BUILT_SOURCES = baobab-resources.c
 
 baobab_VALAFLAGS = \
        --vapidir=$(top_builddir)/egg-list-box  \
-       --vapidir=$(top_builddir)/libgd         \
        --pkg gtk+-3.0                          \
        --pkg gio-2.0                           \
-       --pkg gio-unix-2.0                      \
-       --pkg gd-1.0
+       --pkg gio-unix-2.0
 
 noinst_HEADERS = \
        baobab-chart.h                  \
@@ -56,7 +54,6 @@ baobab-resources.c: baobab.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --gen
 AM_CFLAGS = \
        $(BAOBAB_CFLAGS)                \
        -I$(top_srcdir)/egg-list-box    \
-       -I$(top_srcdir)/libgd           \
        -Wall                           \
        -Wno-unused-but-set-variable    \
        -Wno-unused-variable            \
@@ -66,7 +63,6 @@ baobab_LDFLAGS = -export-dynamic
 baobab_LDADD = \
        -lm                             \
        $(BAOBAB_LIBS)                  \
-       $(top_builddir)/libgd/libgd.la \
        $(NULL)
 
 MAINTAINERCLEANFILES = \
diff --git a/src/baobab-application.vala b/src/baobab-application.vala
index 769894f..1a488e0 100644
--- a/src/baobab-application.vala
+++ b/src/baobab-application.vala
@@ -135,8 +135,6 @@ namespace Baobab {
         public Application () {
             Object (application_id: "org.gnome.baobab", flags: ApplicationFlags.HANDLES_OPEN);
 
-            Gd.ensure_types ();
-
             add_action_entries (action_entries, this);
         }
 


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