diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-04 22:02:53 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-04 22:31:14 +0800 |
| commit | 9f41e5eec7a8971dee4e76636dcdb4318083f6f3 (patch) | |
| tree | c9ba86b7b5a6eeb0ea2162584969dc7feca54d27 | |
| parent | 505ec4079c478b56ce279fad99fdfdd28f2310c6 (diff) | |
| download | gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.tar gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.tar.gz gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.tar.bz2 gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.tar.lz gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.tar.xz gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.tar.zst gsoc2013-empathy-9f41e5eec7a8971dee4e76636dcdb4318083f6f3.zip | |
remove egg-list-box
https://bugzilla.gnome.org/show_bug.cgi?id=706988
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 3 | ||||
| m--------- | libempathy-gtk/egg-list-box | 0 | ||||
| -rw-r--r-- | po/POTFILES.skip | 2 |
6 files changed, 1 insertions, 23 deletions
diff --git a/.gitmodules b/.gitmodules index ad310feb8..6c30dad66 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "libempathy-gtk/egg-list-box"] - path = libempathy-gtk/egg-list-box - url = git://git.gnome.org/egg-list-box [submodule "telepathy-account-widgets"] path = telepathy-account-widgets url = git://git.gnome.org/telepathy-account-widgets.git diff --git a/autogen.sh b/autogen.sh index 0fcb6fd78..ef19a9fb1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -19,17 +19,13 @@ which gnome-autogen.sh || { } # Fetch submodules if needed -if test ! -f libempathy-gtk/egg-list-box/COPYING -o ! -f telepathy-account-widgets/COPYING; +if test ! -f telepathy-account-widgets/COPYING; then echo "+ Setting up submodules" git submodule init fi git submodule update -cd libempathy-gtk/egg-list-box -sh autogen.sh --no-configure -cd ../.. - cd telepathy-account-widgets sh autogen.sh --no-configure cd .. diff --git a/configure.ac b/configure.ac index 5f05c3b63..77be8f463 100644 --- a/configure.ac +++ b/configure.ac @@ -107,16 +107,6 @@ EMPATHY_UOA_PROVIDER=`pkg-config --variable=uoa_provider telepathy-account-widge AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER", [Name of provider for accounts imported from libaccounts]) -# egg-list-box -prev_top_build_prefix=$ac_top_build_prefix -prev_ac_configure_args=$ac_configure_args -AX_CONFIG_DIR([libempathy-gtk/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"libempathy-gtk/egg-list-box -PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box) - AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index baa5a556c..44789fdea 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = egg-list-box - include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ @@ -179,7 +177,6 @@ libempathy_gtk_la_LIBADD = \ $(GCR_LIBS) \ $(MEEGO_LIBS) \ $(CHEESE_LIBS) \ - $(top_builddir)/libempathy-gtk/egg-list-box/libegglistbox.la \ $(top_builddir)/libempathy/libempathy.la check_c_sources = \ diff --git a/libempathy-gtk/egg-list-box b/libempathy-gtk/egg-list-box deleted file mode 160000 -Subproject b0131f8ad049e5debe44e3326cc1a8cab1739e3 diff --git a/po/POTFILES.skip b/po/POTFILES.skip index c635d07ec..7488a6158 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,6 +2,4 @@ data/empathy.desktop.in -libempathy-gtk/egg-list-box/egg-flow-box.c - telepathy-account-widgets |