gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add libgd as a dependency and git submodule

Browse Source 
libgd is required for GdMainView until MainView gets into Gtk (which I hope
will happen)
This commit is contained in:
Gergely Polonkai 2014-07-23 00:18:55 +02:00
parent 47fa484875
commit 809a1b215f
6 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -0,0 +1,3 @@
[submodule "libgd"]
path = libgd
url = git://git.gnome.org/libgd.git

4
Makefile.am
View File

@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
SUBDIRS = src po data help SUBDIRS = libgd src po data help
EXTRA_DIST = config.rpath ChangeLog EXTRA_DIST = config.rpath ChangeLog

4
autogen.sh
View File

@ -4,6 +4,8 @@
srcdir=`dirname $0` srcdir=`dirname $0`
test -z "$srcdir" && srcdir=. test -z "$srcdir" && srcdir=.
ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
PKG_NAME="astrognome" PKG_NAME="astrognome"
(test -f $srcdir/configure.ac \ (test -f $srcdir/configure.ac \
@ -18,5 +20,7 @@ which gnome-autogen.sh || {
exit 1 exit 1
} }
git submodule update --init --recursive
REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh

5
configure.ac
View File

@ -38,8 +38,13 @@ PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0])
PKG_CHECK_MODULES([GDA], [libgda-5.0 libgda-sqlite-5.0]) PKG_CHECK_MODULES([GDA], [libgda-5.0 libgda-sqlite-5.0])
PKG_CHECK_MODULES([SWE_GLIB], [swe-glib >= 2.1.0]) PKG_CHECK_MODULES([SWE_GLIB], [swe-glib >= 2.1.0])
LIBGD_INIT([
main-view
])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
libgd/Makefile
src/Makefile src/Makefile
help/Makefile help/Makefile
po/Makefile.in po/Makefile.in

1
libgd Submodule

@ -0,0 +1 @@
Subproject commit 62f9b8b92599b38d986bd26d5780edd400d318c9

4
src/Makefile.am
View File

@ -27,11 +27,11 @@ EXTRA_DIST = \
ag.gresource.xml \ ag.gresource.xml \
$(NULL) $(NULL)
AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Astrognome\" -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Astrognome\" -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" -I$(top_srcdir)/libgd
bin_PROGRAMS = astrognome bin_PROGRAMS = astrognome
astrognome_SOURCES = $(astrognome_source_files) $(BUILT_SOURCES) astrognome_SOURCES = $(astrognome_source_files) $(BUILT_SOURCES)
astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(WEBKIT_LIBS) $(GDA_LIBS) astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(WEBKIT_LIBS) $(GDA_LIBS) $(top_builddir)/libgd/libgd.la
astrognome_LDFLAGS = -rdynamic astrognome_LDFLAGS = -rdynamic
astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) -Wall astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) -Wall