Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-me/log-and-name/+merge/46506 proposed by: Ted Gould (ted) review: Approve - Mikkel Kamstrup Erlandsen (kamstrup) ------------------------------------------------------------ revno: 123 [merge] committer: Ted Gould <[email protected]> branch nick: trunk timestamp: Tue 2011-01-18 12:14:30 -0600 message: Adding log domain and building AUTHORS and ChangeLog at dist modified: AUTHORS ChangeLog Makefile.am src/Makefile.am
-- lp:indicator-me https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk Your team ayatana-commits is subscribed to branch lp:indicator-me. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk/+edit-subscription
=== modified file 'AUTHORS' --- AUTHORS 2009-09-24 00:14:01 +0000 +++ AUTHORS 2011-01-17 17:30:48 +0000 @@ -1,2 +1,2 @@ -Ted Gould <[email protected]> -Cody Russell <[email protected]> +# Generated by Makefile. Do not edit! + === modified file 'ChangeLog' --- ChangeLog 2008-12-05 03:13:41 +0000 +++ ChangeLog 2011-01-17 17:30:48 +0000 @@ -0,0 +1,2 @@ +# Generated by Makefile. Do not edit! + === modified file 'Makefile.am' --- Makefile.am 2010-01-21 21:47:09 +0000 +++ Makefile.am 2011-01-17 17:30:00 +0000 @@ -7,3 +7,28 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall +dist-hook: + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ + fi + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ + fi === modified file 'src/Makefile.am' --- src/Makefile.am 2011-01-13 20:37:08 +0000 +++ src/Makefile.am 2011-01-17 17:28:49 +0000 @@ -14,7 +14,10 @@ dbus-shared-names.h \ gen-me-service.xml.h \ gen-me-service.xml.c -libme_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror +libme_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Me\" libme_la_LIBADD = $(APPLET_LIBS) libme_la_LDFLAGS = -module -avoid-version @@ -46,7 +49,9 @@ status-provider-telepathy.c \ status-provider-telepathy-marshal.h \ status-provider-telepathy-marshal.c -indicator_me_service_CFLAGS = $(MESERVICE_CFLAGS) -Wall -Werror +indicator_me_service_CFLAGS = $(MESERVICE_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Me\" indicator_me_service_LDADD = $(MESERVICE_LIBS) gen-%.xml.h: %.xml
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
