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