From b725882654c229bca4396c5c168b5f56e0ae3538 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Fri, 26 Sep 2014 21:10:59 +0200 Subject: [PATCH] Remove libgd from the dependencies --- .gitmodules | 3 --- Makefile.am | 2 +- configure.ac | 5 ----- src/Makefile.am | 4 ++-- 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f24da7e..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libgd"] - path = libgd - url = git://git.gnome.org/libgd.git diff --git a/Makefile.am b/Makefile.am index b9abb11..adb3a85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} -SUBDIRS = libgd src po data help +SUBDIRS = src po data help EXTRA_DIST = config.rpath ChangeLog diff --git a/configure.ac b/configure.ac index 02c8741..fa841e5 100644 --- a/configure.ac +++ b/configure.ac @@ -42,13 +42,8 @@ PKG_CHECK_MODULES([RSVG], [librsvg-2.0]) PKG_CHECK_MODULES([SWE_GLIB], [swe-glib >= 2.1.0]) PKG_CHECK_MODULES([CAIRO], [cairo]); -LIBGD_INIT([ - main-view -]) - AC_CONFIG_FILES([ Makefile - libgd/Makefile src/Makefile help/Makefile po/Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 3f9c4f1..4862c2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,11 +42,11 @@ EXTRA_DIST = \ ag.gresource.xml \ $(NULL) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Astrognome\" -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" -I$(top_srcdir)/libgd +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Astrognome\" -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" bin_PROGRAMS = astrognome astrognome_SOURCES = $(astrognome_source_files) $(BUILT_SOURCES) -astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(WEBKIT_LIBS) $(GDA_LIBS) $(PIXBUF_LIBS) $(RSVG_LIBS) $(CAIRO_LIBS) $(top_builddir)/libgd/libgd.la +astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(WEBKIT_LIBS) $(GDA_LIBS) $(PIXBUF_LIBS) $(RSVG_LIBS) $(CAIRO_LIBS) astrognome_LDFLAGS = -rdynamic astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) $(PIXBUF_CFLAGS) $(RSVG_CFLAGS) $(CAIRO_CFLAGS) -Wall