[gnome-control-center/wip/gbsneto/remove-old-shell: 15/18] project: Drop the old shell
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/gbsneto/remove-old-shell: 15/18] project: Drop the old shell
- Date: Tue, 28 Nov 2017 01:35:51 +0000 (UTC)
commit e5fc54d56d95b0bd47979b6fb0ed61f21a86ae1d
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Nov 11 00:40:34 2017 -0200
project: Drop the old shell
This is not used anymore, and is only consuming compile
time now.
https://bugzilla.gnome.org/show_bug.cgi?id=790923
configure.ac | 1 -
shell/Makefile.am | 21 +-
shell/alt/Makefile.am | 22 -
shell/alt/cc-window.c | 1606 -------------------------------------------------
shell/alt/cc-window.h | 46 --
5 files changed, 2 insertions(+), 1694 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cb82d69..582fb4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -563,7 +563,6 @@ po/Makefile.in
libgd/Makefile
search-provider/Makefile
shell/appdata/Makefile
-shell/alt/Makefile
shell/Makefile
shell/gnome-control-center.desktop.in
man/Makefile
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8099330..371d78a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.decl
-SUBDIRS = appdata alt
+SUBDIRS = appdata
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
$(CHEESE_CFLAGS) \
$(WACOM_PANEL_CFLAGS) \
-I$(top_srcdir)/panels/common/ \
- -I$(top_srcdir)/shell/alt \
-I$(top_srcdir)/libgd
all-local: check-local
@@ -24,8 +23,6 @@ libshell_la_SOURCES = \
bin_PROGRAMS = gnome-control-center
-noinst_PROGRAMS = gnome-control-center-alt
-
common_sources = \
$(BUILT_SOURCES) \
main.c \
@@ -60,17 +57,7 @@ gnome_control_center_SOURCES = \
cc-window.c \
cc-window.h
-gnome_control_center_alt_SOURCES = \
- $(common_sources)
-
gnome_control_center_LDFLAGS = -export-dynamic
-gnome_control_center_alt_LDFLAGS = -export-dynamic
-
-# Temporarily add the CC_ENABLE_ALT_CATEGORIES compile-time
-# flag to keep the current panels working.
-gnome_control_center_alt_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DCC_ENABLE_ALT_CATEGORIES
gnome_control_center_LDADD = \
libshell.la \
@@ -110,10 +97,6 @@ if BUILD_BLUETOOTH
gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
endif
-gnome_control_center_alt_LDADD = \
- $(gnome_control_center_LDADD) \
- alt/libshell_alt.la
-
# Because it is confusing and somewhat problematic to directly add and compile
# cc-panel-loader.o by another directory (i.e. the shell search provider), we
# have to create a library and link it there, just like libshell.la.
@@ -167,7 +150,7 @@ CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA)
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
TEST_PROGS += test-hostname
-noinst_PROGRAMS += test-hostname
+noinst_PROGRAMS = test-hostname
test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]