blob: 176e979982f81d9bf9a716d62cbeb887c9bc8147 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sat, 31 Mar 2018 22:29:16 +0200
4Subject: [PATCH] do not build demos
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9They are not installed anyway and add libepoxy dependency
10
11Upstream-Status: Pending
12
13Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com>
14---
15 Makefile.am | 3 ++-
16 configure.ac | 3 ---
17 2 files changed, 2 insertions(+), 4 deletions(-)
18
19diff --git a/Makefile.am b/Makefile.am
20index 984b6a7..6c754a6 100644
21--- a/Makefile.am
22+++ b/Makefile.am
23@@ -28,7 +28,8 @@ doc_subdirs = docs
24 else
25 doc_subdirs =
26 endif
27-SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs)
28+
29+SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs)
30
31 gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME)
32 gdkmm_include_HEADERS = gdk/gdkmm.h
33diff --git a/configure.ac b/configure.ac
34index e5e82dc..c1c7658 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno],
38 [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"])
39 AC_SUBST([GTKMM_MODULES])
40
41-AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2'])
42-
43 PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES])
44 PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES])
45-PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES])
46
47 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
48 MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
49--
502.14.3
51