1From 4a89ddffbb14d747adbe3365ace4db87de52ba39 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 16 Sep 2013 16:08:28 +0200
4Subject: [PATCH] build gtk- and gtk3-version for canberra_gtk_play
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
10---
11 src/Makefile.am |   25 +++++++++++++++----------
12 1 files changed, 15 insertions(+), 10 deletions(-)
13
14diff --git a/src/Makefile.am b/src/Makefile.am
15index 56ed96d..fc72e1f 100644
16--- a/src/Makefile.am
17+++ b/src/Makefile.am
18@@ -319,9 +319,6 @@ endif
19
20 if HAVE_GTK_ANY
21
22-bin_PROGRAMS += \
23-	canberra-gtk-play
24-
25 include_HEADERS += \
26 	canberra-gtk.h
27
28@@ -329,6 +326,9 @@ endif
29
30 if HAVE_GTK3
31
32+bin_PROGRAMS += \
33+	canberra-gtk3-play
34+
35 lib_LTLIBRARIES += \
36 	libcanberra-gtk3.la
37
38@@ -367,6 +367,9 @@ endif
39
40 if HAVE_GTK
41
42+bin_PROGRAMS += \
43+	canberra-gtk-play
44+
45 lib_LTLIBRARIES += \
46 	libcanberra-gtk.la
47
48@@ -399,14 +402,17 @@ endif
49
50 if HAVE_GTK3
51
52-canberra_gtk_play_LDADD = \
53+canberra_gtk3_play_LDADD = \
54 	$(GTK3_LIBS) \
55 	libcanberra.la \
56 	libcanberra-gtk3.la
57-canberra_gtk_play_CFLAGS = \
58+canberra_gtk3_play_CFLAGS = \
59 	$(GTK3_CFLAGS)
60
61-else
62+canberra_gtk3_play_SOURCES = \
63+	canberra-gtk-play.c
64+
65+endif
66 if HAVE_GTK
67
68 canberra_gtk_play_LDADD = \
69@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \
70 canberra_gtk_play_CFLAGS = \
71 	$(GTK_CFLAGS)
72
73-endif
74+canberra_gtk_play_SOURCES = \
75+	canberra-gtk-play.c
76+
77 endif
78
79 if HAVE_GTK_ANY
80@@ -424,9 +432,6 @@ if HAVE_GTK_ANY
81 dist_gsdgtkmodules_DATA = \
82 	canberra-gtk-module.desktop
83
84-canberra_gtk_play_SOURCES = \
85-	canberra-gtk-play.c
86-
87 EXTRA_DIST += \
88 	libcanberra-login-sound.desktop.in \
89 	libcanberra-ready-sound.desktop.in \
90--
911.7.6.5
92
93