[metacity/remove-window-demo: 16/17] tools: remove window demo

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 072df93b4de8844903e988bc1b70fd3ce88a744d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Mar 6 05:10:57 2020 +0200

    tools: remove window demo

 HACKING                            |    4 -
 configure.ac                       |    2 -
 doc/man/Makefile.am                |    9 +-
 doc/man/metacity-theme-viewer.1    |    3 +-
 doc/man/metacity-window-demo.1     |   25 -
 src/tools/Makefile.am              |   21 +-
 src/tools/metacity-window-demo.c   | 1111 ------------------------------------
 src/tools/metacity-window-demo.png |  Bin 3453 -> 0 bytes
 8 files changed, 17 insertions(+), 1158 deletions(-)
---
diff --git a/HACKING b/HACKING
index 21e62116..57ff1d1e 100644
--- a/HACKING
+++ b/HACKING
@@ -208,10 +208,6 @@ Debugging information
     work--but if you disable the keybindings for the global Metacity then
     the Metacity under the Xnest can then get those keybinding notifications).
 
-  metacity-window-demo
-    metacity-window-demo is good for trying behavior of various kinds
-    of window without launching a full desktop.
-
 Technical gotchas to keep in mind
   Files that include gdk.h or gtk.h are not supposed to include
   display.h or window.h or other core files.  Files in the core
diff --git a/configure.ac b/configure.ac
index 8cb07c64..c2993f90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,6 @@ AC_ARG_ENABLE(render,
 ## here we get the flags we'll actually use
 PKG_CHECK_MODULES(ALL, glib-2.0 >= $GLIB_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION)
 PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
-PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
 
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -294,7 +293,6 @@ fi
 
 METACITY_LIBS="$ALL_LIBS $METACITY_LIBS $RANDR_LIBS -lX11 -lXext $X_EXTRA_LIBS $LIBM"
 METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS -lX11 $X_EXTRA_LIBS"
-METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS -lX11 $X_EXTRA_LIBS $LIBM"
 METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS -lX11 $X_EXTRA_LIBS"
 
 found_sm=no
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 77b8ab13..7fce4349 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,5 +1,10 @@
-man_MANS = metacity.1 metacity-theme-viewer.1 \
-          metacity-window-demo.1 metacity-message.1
+NULL =
+
+man_MANS = \
+       metacity.1 \
+       metacity-message.1 \
+       metacity-theme-viewer.1 \
+       $(NULL)
 
 EXTRA_DIST = $(man_MANS)
 
diff --git a/doc/man/metacity-theme-viewer.1 b/doc/man/metacity-theme-viewer.1
index 72df142f..44ab0b88 100644
--- a/doc/man/metacity-theme-viewer.1
+++ b/doc/man/metacity-theme-viewer.1
@@ -39,5 +39,4 @@ This manual page was written by Jose M. Moya <josem die upm es>, for
 the Debian  GNU/Linux system (but may be used by others).
 .SH "SEE ALSO"
 .\" Always quote multiple words for .SH
-.BR metacity (1),
-.BR metacity-window-demo (1).
+.BR metacity (1).
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 24555fc2..356e8827 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,25 +1,22 @@
 NULL =
 
-icondir=$(pkgdatadir)/icons
-icon_DATA=metacity-window-demo.png
+bin_PROGRAMS = metacity-message
 
-AM_CPPFLAGS=@METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
+metacity_message_CFLAGS = \
        -DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
        -DMETACITY_LOCALEDIR=\""$(localedir)"\" \
+       $(METACITY_MESSAGE_CFLAGS) \
        $(WARN_CFLAGS) \
        $(AM_CFLAGS) \
        $(NULL)
 
-metacity_message_SOURCES=                              \
-       metacity-message.c
-
-metacity_window_demo_SOURCES=                          \
-       metacity-window-demo.c
-
-bin_PROGRAMS=metacity-message metacity-window-demo
+metacity_message_SOURCES = \
+       metacity-message.c \
+       $(NULL)
 
-metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
-metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
+metacity_message_LDADD = \
+       $(METACITY_MESSAGE_LIBS) \
+       $(NULL)
 
 EXTRA_DIST=$(icon_DATA)