diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-01-11 16:11:41 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-01-11 16:20:53 +0100 |
| commit | 5996ace846aaf824fe81b4ec43f4acc1ae55a721 (patch) | |
| tree | 11d91c2037cdc9e51e6cc3e6caf41148c5b0ef65 | |
| parent | 082cd72df87223caa3c491c3161a8d6e8e935e2d (diff) | |
| download | gnome-control-center-5996ace846aaf824fe81b4ec43f4acc1ae55a721.tar.gz | |
build: Add libgd submodule
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| m--------- | libgd | 0 |
5 files changed, 13 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index a9208a062..5287565a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,7 @@ [submodule "panels/sound/gvc"] path = panels/sound/gvc url = git://git.gnome.org/libgnome-volume-control + +[submodule "libgd"] + path = libgd + url = git://git.gnome.org/libgd diff --git a/Makefile.am b/Makefile.am index f1c7e1eef..42803bec6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} -SUBDIRS = po egg-list-box panels shell +SUBDIRS = libgd po egg-list-box panels shell if BUILD_DOCUMENTATION SUBDIRS += man endif -DIST_SUBDIRS = egg-list-box po panels shell man +DIST_SUBDIRS = libgd egg-list-box po panels shell man MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ diff --git a/autogen.sh b/autogen.sh index 735fceebf..64b68618b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,6 +5,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="control-center" +ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" (test -f $srcdir/configure.ac \ && test -f $srcdir/autogen.sh \ @@ -19,12 +20,8 @@ DIE=0 rm -f .using-gnome-libs-package # Fetch submodules if needed -if test ! -f egg-list-box/COPYING; -then - echo "+ Setting up submodules" - git submodule init -fi -git submodule update +echo "+ Setting up submodules" +git submodule update --init --recursive cd egg-list-box sh autogen.sh --no-configure diff --git a/configure.ac b/configure.ac index 44fc52170..65bdb3b8c 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,8 @@ COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION gsettings-desktop-schemas >= $SCHEMAS_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION" +LIBGD_INIT([_view-common]) + PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) # egg-list-box is a static library, so it must be shared among all panels @@ -502,6 +504,7 @@ panels/wacom/Makefile panels/wacom/calibrator/Makefile panels/wacom/gnome-wacom-panel.desktop.in po/Makefile.in +libgd/Makefile shell/Makefile shell/gnome-control-center.desktop.in man/Makefile diff --git a/libgd b/libgd new file mode 160000 +Subproject 680a9f72a0c3019cf4013ed026270ee7b9f1abc |