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--- 11Upstream-Status: Pending 12 13 src/Makefile.am | 25 +++++++++++++++---------- 14 1 files changed, 15 insertions(+), 10 deletions(-) 15 16diff --git a/src/Makefile.am b/src/Makefile.am 17index 56ed96d..fc72e1f 100644 18--- a/src/Makefile.am 19+++ b/src/Makefile.am 20@@ -319,9 +319,6 @@ endif 21 22 if HAVE_GTK_ANY 23 24-bin_PROGRAMS += \ 25- canberra-gtk-play 26- 27 include_HEADERS += \ 28 canberra-gtk.h 29 30@@ -329,6 +326,9 @@ endif 31 32 if HAVE_GTK3 33 34+bin_PROGRAMS += \ 35+ canberra-gtk3-play 36+ 37 lib_LTLIBRARIES += \ 38 libcanberra-gtk3.la 39 40@@ -367,6 +367,9 @@ endif 41 42 if HAVE_GTK 43 44+bin_PROGRAMS += \ 45+ canberra-gtk-play 46+ 47 lib_LTLIBRARIES += \ 48 libcanberra-gtk.la 49 50@@ -399,14 +402,17 @@ endif 51 52 if HAVE_GTK3 53 54-canberra_gtk_play_LDADD = \ 55+canberra_gtk3_play_LDADD = \ 56 $(GTK3_LIBS) \ 57 libcanberra.la \ 58 libcanberra-gtk3.la 59-canberra_gtk_play_CFLAGS = \ 60+canberra_gtk3_play_CFLAGS = \ 61 $(GTK3_CFLAGS) 62 63-else 64+canberra_gtk3_play_SOURCES = \ 65+ canberra-gtk-play.c 66+ 67+endif 68 if HAVE_GTK 69 70 canberra_gtk_play_LDADD = \ 71@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \ 72 canberra_gtk_play_CFLAGS = \ 73 $(GTK_CFLAGS) 74 75-endif 76+canberra_gtk_play_SOURCES = \ 77+ canberra-gtk-play.c 78+ 79 endif 80 81 if HAVE_GTK_ANY 82@@ -424,9 +432,6 @@ if HAVE_GTK_ANY 83 dist_gsdgtkmodules_DATA = \ 84 canberra-gtk-module.desktop 85 86-canberra_gtk_play_SOURCES = \ 87- canberra-gtk-play.c 88- 89 EXTRA_DIST += \ 90 libcanberra-login-sound.desktop.in \ 91 libcanberra-ready-sound.desktop.in \ 92-- 931.7.6.5 94 95