diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2009-09-24 18:11:10 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2009-09-24 18:11:10 -0400 |
| commit | 8bbcf87cf6cd876eacec968438d1622e3b362225 (patch) | |
| tree | d955b77d089152549107434f38df5dd12abddefb /src/Makefile.am | |
| parent | 86c162bb5ae1eca498296d7890789130b9eea2a4 (diff) | |
| parent | 2bddafc048379759d720f250739c59fcad7f6249 (diff) | |
| download | ayatana-indicator-session-8bbcf87cf6cd876eacec968438d1622e3b362225.tar.gz ayatana-indicator-session-8bbcf87cf6cd876eacec968438d1622e3b362225.tar.bz2 ayatana-indicator-session-8bbcf87cf6cd876eacec968438d1622e3b362225.zip | |
* Upstream release 0.1.5 (LP: #436223)
* PolicyKit-1 support (LP: #418643)
* GDM User list support (LP: #422052)
* MissionControl5 support (LP: #427643)
* Better locking of the screensaver (LP: #428115)
* debian/control: Adding in a libempathy-dev build dependency
as it's now required by upstream.
* Removing patches 01_polkit-1.patch and 99_autoreconf.patch
as they were merged upstream.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e2f0008..17d14e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,8 @@ sessionlib_LTLIBRARIES = libsession.la libsession_la_SOURCES = \ indicator-session.c \ dbus-shared-names.h \ - status-service-client.h + status-service-client.h \ + users-service-client.h libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libsession_la_LIBADD = $(APPLET_LIBS) libsession_la_LDFLAGS = -module -avoid-version @@ -25,8 +26,16 @@ indicator_status_service_SOURCES = \ status-service-dbus.h \ status-service-dbus.c \ status-service-server.h \ + users-service-dbus.h \ + users-service-dbus.c \ + users-service-marshal.c \ + users-service-marshal.h \ status-provider.h \ status-provider.c \ + status-provider-mc5.h \ + status-provider-mc5.c \ + status-provider-mc5-marshal.h \ + status-provider-mc5-marshal.c \ status-provider-pidgin.h \ status-provider-pidgin.c \ status-provider-pidgin-marshal.h \ @@ -38,6 +47,13 @@ indicator_status_service_SOURCES = \ indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) +users-service-client.h: $(srcdir)/users-service.xml + dbus-binding-tool \ + --prefix=_users_service_client \ + --mode=glib-client \ + --output=users-service-client.h \ + $(srcdir)/users-service.xml + status-service-client.h: $(srcdir)/status-service.xml dbus-binding-tool \ --prefix=_status_service_client \ @@ -52,6 +68,16 @@ status-service-server.h: $(srcdir)/status-service.xml --output=status-service-server.h \ $(srcdir)/status-service.xml +users-service-marshal.h: $(srcdir)/users-service.list + glib-genmarshal --header \ + --prefix=_users_service_marshal $(srcdir)/users-service.list \ + > users-service-marshal.h + +users-service-marshal.c: $(srcdir)/users-service.list + glib-genmarshal --body \ + --prefix=_users_service_marshal $(srcdir)/users-service.list \ + > users-service-marshal.c + status-provider-pidgin-marshal.h: $(srcdir)/status-provider-pidgin.list glib-genmarshal --header \ --prefix=_status_provider_pidgin_marshal $(srcdir)/status-provider-pidgin.list \ @@ -72,11 +98,21 @@ status-provider-telepathy-marshal.c: $(srcdir)/status-provider-telepathy.list --prefix=_status_provider_telepathy_marshal $(srcdir)/status-provider-telepathy.list \ > status-provider-telepathy-marshal.c +status-provider-mc5-marshal.h: $(srcdir)/status-provider-mc5.list + glib-genmarshal --header \ + --prefix=_status_provider_mc5_marshal $(srcdir)/status-provider-mc5.list \ + > status-provider-mc5-marshal.h + +status-provider-mc5-marshal.c: $(srcdir)/status-provider-mc5.list + glib-genmarshal --body \ + --prefix=_status_provider_mc5_marshal $(srcdir)/status-provider-mc5.list \ + > status-provider-mc5-marshal.c + ############### # Users Stuff ############### -indicator_users_service_SOURCES = users-service.c +indicator_users_service_SOURCES = users-service.c users-service-dbus.c users-service-marshal.c indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) -Wall -Werror indicator_users_service_LDADD = $(USERSSERVICE_LIBS) @@ -93,8 +129,13 @@ indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS) ############### BUILT_SOURCES = \ + users-service-client.h \ status-service-client.h \ status-service-server.h \ + status-provider-mc5-marshal.h \ + status-provider-mc5-marshal.c \ + users-service-marshal.h \ + users-service-marshal.c \ status-provider-pidgin-marshal.h \ status-provider-pidgin-marshal.c \ status-provider-telepathy-marshal.h \ @@ -102,6 +143,7 @@ BUILT_SOURCES = \ EXTRA_DIST = \ status-service.xml \ + status-provider-mc5.list \ status-provider-pidgin.list \ status-provider-telepathy.list |