Commit 620bc4bb authored by Kalev Lember's avatar Kalev Lember Committed by Thomas Wood
parent a14e52b9
[submodule "egg-list-box"]
path = egg-list-box
url = git://git.gnome.org/egg-list-box
[submodule "panels/sound/gvc"] [submodule "panels/sound/gvc"]
path = panels/sound/gvc path = panels/sound/gvc
url = git://git.gnome.org/libgnome-volume-control url = git://git.gnome.org/libgnome-volume-control
......
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
SUBDIRS = libgd po egg-list-box panels shell search-provider SUBDIRS = libgd po panels shell search-provider
if BUILD_DOCUMENTATION if BUILD_DOCUMENTATION
SUBDIRS += man SUBDIRS += man
endif endif
DIST_SUBDIRS = libgd egg-list-box po panels shell man search-provider DIST_SUBDIRS = libgd po panels shell man search-provider
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \ $(srcdir)/INSTALL \
......
...@@ -23,10 +23,6 @@ rm -f .using-gnome-libs-package ...@@ -23,10 +23,6 @@ rm -f .using-gnome-libs-package
echo "+ Setting up submodules" echo "+ Setting up submodules"
git submodule update --init --recursive git submodule update --init --recursive
cd egg-list-box
sh autogen.sh --no-configure
cd ..
if ! which gnome-autogen.sh ; then if ! which gnome-autogen.sh ; then
echo "You need to install the gnome-common module and make" echo "You need to install the gnome-common module and make"
echo "sure the gnome-autogen.sh script is in your \$PATH." echo "sure the gnome-autogen.sh script is in your \$PATH."
......
...@@ -79,15 +79,6 @@ else ...@@ -79,15 +79,6 @@ else
IBUS_MODULE= IBUS_MODULE=
fi fi
# EggListBox submodule
prev_top_build_prefix=$ac_top_build_prefix
prev_ac_configure_args=$ac_configure_args
AX_CONFIG_DIR([egg-list-box])
ac_top_build_prefix=$prev_top_build_prefix
ac_configure_args=$prev_ac_configure_args
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"egg-list-box
dnl ============================================== dnl ==============================================
dnl Check that we meet the dependencies dnl Check that we meet the dependencies
dnl ============================================== dnl ==============================================
...@@ -124,9 +115,7 @@ LIBGD_INIT([_view-common notification main-toolbar header-bar stack static]) ...@@ -124,9 +115,7 @@ LIBGD_INIT([_view-common notification main-toolbar header-bar stack static])
PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
# egg-list-box is a static library, so it must be shared among all panels PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
# or it breaks GType registration
PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 egg-list-box polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0 PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION) gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
...@@ -173,7 +162,7 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES ...@@ -173,7 +162,7 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
pwquality >= $PWQAULITY_REQUIRED_VERSION pwquality >= $PWQAULITY_REQUIRED_VERSION
accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION) accountsservice >= $ACCOUNTSSERVICE_REQUIRED_VERSION)
PKG_CHECK_MODULES(SHARING_PANEL, $COMMON_MODULES egg-list-box) PKG_CHECK_MODULES(SHARING_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(REMOTE_LOGIN_HELPER, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0) PKG_CHECK_MODULES(REMOTE_LOGIN_HELPER, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0)
PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib) PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib)
......
egg-list-box @ d189c2a3
Subproject commit d189c2a3235ce1a525fd5ed8a44d60d8d0d2e9b3
egg-list-box/egg-flow-box.c
libgd/libgd/gd-header-bar.c libgd/libgd/gd-header-bar.c
panels/background/gnome-background-panel.desktop.in panels/background/gnome-background-panel.desktop.in
panels/bluetooth/gnome-bluetooth-panel.desktop.in panels/bluetooth/gnome-bluetooth-panel.desktop.in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment