aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS4
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am25
-rw-r--r--data/Makefile.am3
-rw-r--r--data/indicator-users.service.in3
-rw-r--r--src/Makefile.am16
6 files changed, 43 insertions, 10 deletions
diff --git a/AUTHORS b/AUTHORS
index a1771e3..a741f25 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-Ted Gould <ted@canonical.com>
-Cody Russell <crussell@canonical.com>
+# Generated by Makefile
+
diff --git a/ChangeLog b/ChangeLog
index e69de29..a741f25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+# Generated by Makefile
+
diff --git a/Makefile.am b/Makefile.am
index 39b5cdb..391ff49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,28 @@ EXTRA_DIST = autogen.sh
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
diff --git a/data/Makefile.am b/data/Makefile.am
index 70ea880..f452897 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,7 @@
SUBDIRS = icons
dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files = indicator-users.service.in \
- indicator-session.service.in
+service_in_files = indicator-session.service.in
dbus_services_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
diff --git a/data/indicator-users.service.in b/data/indicator-users.service.in
deleted file mode 100644
index 8bb6819..0000000
--- a/data/indicator-users.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.users
-Exec=@libexecdir@/indicator-users-service
diff --git a/src/Makefile.am b/src/Makefile.am
index 190d012..4fa43b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,10 @@ libsession_la_SOURCES = \
dbus-shared-names.h \
dbusmenu-shared.h \
users-service-client.h
-libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
+libsession_la_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Session\"
libsession_la_LIBADD = $(APPLET_LIBS)
libsession_la_LDFLAGS = -module -avoid-version
@@ -90,8 +93,15 @@ indicator_session_service_SOURCES = \
users-service-dbus.h \
users-service-dbus.c \
users-service-marshal.c
-indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
+indicator_session_service_CFLAGS = \
+ $(SESSIONSERVICE_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Session\"
+indicator_session_service_LDADD = \
+ $(SESSIONSERVICE_LIBS) \
+ $(GCONF_LIBS)
#################
# GTK Logout Stuff