[gnome-mud] gtk-builder: Remove glade
- From: Mart Raudsepp <mraudsepp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-mud] gtk-builder: Remove glade
- Date: Wed, 26 Jul 2017 13:03:18 +0000 (UTC)
commit 99c011dc7f2179fcd8bc6b62ea9aa7ca1a7f3139
Author: Steven Jackson <sj oscode net>
Date: Wed Apr 26 12:12:48 2017 +0100
gtk-builder: Remove glade
configure.ac | 3 +-
src/Makefile.am | 1 -
ui/Makefile.am | 8 +-
ui/main.glade | 985 --------------------------------------
ui/muds.glade | 1087 -----------------------------------------
ui/prefs.glade | 1433 -------------------------------------------------------
6 files changed, 2 insertions(+), 3515 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0ff43ed..024886f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,14 +71,13 @@ AC_CHECK_HEADERS(strings.h)
dnl pkg-config dep checks
GMODULE_REQUIRED=2.0.0
GTK_REQUIRED=2.24.0
-LIBGLADE_REQUIRED=2.0.1
LIBGLIB_REQUIRED=2.36
VTE_REQUIRED=0.11.00
PCRE_REQUIRED=6.0.0
GCONF_REQUIRED=0.20
GSTREAMER_REQUIRED=1.0
-PKG_CHECK_MODULES(GMUD, gtk+-2.0 >= $GTK_REQUIRED vte >= $VTE_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED
libpcre >= $PCRE_REQUIRED gmodule-2.0 >= $GMODULE_REQUIRED gio-2.0 >= $LIBGLIB_REQUIRED gconf-2.0 >=
$GCONF_REQUIRED)
+PKG_CHECK_MODULES(GMUD, gtk+-2.0 >= $GTK_REQUIRED vte >= $VTE_REQUIRED libpcre >= $PCRE_REQUIRED gmodule-2.0
= $GMODULE_REQUIRED gio-2.0 >= $LIBGLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
AC_SUBST(GMUD_CFLAGS)
AC_SUBST(GMUD_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 12ebdfe..6806202 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,6 @@ gnome_mud_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
- -DGLADEDIR=\""$(pkgdatadir)"\" \
-DUIDIR=\""$(pkgdatadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\"
diff --git a/ui/Makefile.am b/ui/Makefile.am
index d34fdc2..3644270 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,9 +1,3 @@
-gladedir = $(pkgdatadir)
-glade_DATA = \
- main.glade \
- muds.glade \
- prefs.glade
-
uidir=$(pkgdatadir)
ui_DATA = \
@@ -11,7 +5,7 @@ ui_DATA = \
muds.ui \
prefs.ui
-EXTRA_DIST = $(glade_DATA) $(ui_DATA)
+EXTRA_DIST = $(ui_DATA)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]