Add libgd as a dependency and git submodule
libgd is required for GdMainView until MainView gets into Gtk (which I hope will happen)
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							| @@ -0,0 +1,3 @@ | ||||
| [submodule "libgd"] | ||||
| 	path = libgd | ||||
| 	url = git://git.gnome.org/libgd.git | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| ACLOCAL_AMFLAGS = -I m4 | ||||
| SUBDIRS = src po data help | ||||
| ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} | ||||
| SUBDIRS = libgd src po data help | ||||
|  | ||||
| EXTRA_DIST = config.rpath ChangeLog | ||||
|  | ||||
|   | ||||
| @@ -4,6 +4,8 @@ | ||||
| srcdir=`dirname $0` | ||||
| test -z "$srcdir" && srcdir=. | ||||
|  | ||||
| ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" | ||||
|  | ||||
| PKG_NAME="astrognome" | ||||
|  | ||||
| (test -f $srcdir/configure.ac \ | ||||
| @@ -18,5 +20,7 @@ which gnome-autogen.sh || { | ||||
|     exit 1 | ||||
| } | ||||
|  | ||||
| git submodule update --init --recursive | ||||
|  | ||||
| REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh | ||||
|  | ||||
|   | ||||
| @@ -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([SWE_GLIB], [swe-glib >= 2.1.0]) | ||||
|  | ||||
| LIBGD_INIT([ | ||||
|     main-view | ||||
| ]) | ||||
|  | ||||
| AC_CONFIG_FILES([ | ||||
|     Makefile | ||||
|     libgd/Makefile | ||||
|     src/Makefile | ||||
|     help/Makefile | ||||
|     po/Makefile.in | ||||
|   | ||||
							
								
								
									
										1
									
								
								libgd
									
									
									
									
									
										Submodule
									
								
							
							
								
								
								
								
								
							
						
						
									
										1
									
								
								libgd
									
									
									
									
									
										Submodule
									
								
							 Submodule libgd added at 62f9b8b925
									
								
							| @@ -27,11 +27,11 @@ EXTRA_DIST = \ | ||||
| 			 ag.gresource.xml \ | ||||
| 			 $(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 | ||||
|  | ||||
| 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_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) -Wall | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user