From 2e49d9c3cde768b4d284bc149e4679944f66342f Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 5 Dec 2010 12:44:17 +0200 Subject: [PATCH] * toys/mug/Makefile.am: include the mug icon for 'make dist' --- toys/mug/Makefile.am | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/toys/mug/Makefile.am b/toys/mug/Makefile.am index a1c73603..89fb79af 100644 --- a/toys/mug/Makefile.am +++ b/toys/mug/Makefile.am @@ -2,7 +2,7 @@ ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or +## t he Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,19 +23,19 @@ SUBDIRS= . #SUBDIRS += tests #endif -INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) +INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) -DICONDIR='"$(icondir)"' # don't use -Werror, as it might break on other compilers # use -Wno-unused-parameters, because some callbacks may not # really need all the params they get -AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement -AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter -DICONDIR='"$(icondir)"' \ - -DICONDIR='"$(icondir)"' +AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement +AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter + bin_PROGRAMS= \ mug -# note, mu.cc is only '.cc' and not '.c' because libmu must explicitly +# note, mug.cc is '.cc' only because libmu must explicitly # be linked as c++, not c. mug_SOURCES= \ mug.cc \ @@ -56,7 +56,7 @@ icondir= \ $(datarootdir)/icons icon_DATA= \ - ${top_srcdir}/toys/mug/mug.svg + mug.svg desktopdir= \ $(datarootdir)/applications @@ -65,5 +65,7 @@ desktop_DATA= \ mug.desktop EXTRA_DIST= \ - $(desktopentry_DATA) + $(desktop_DATA) \ + $(icon_DATA) +