diff options
| author | Cody Russell <crussell@canonical.com> | 2009-09-24 12:09:22 -0500 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2009-09-24 12:09:22 -0500 |
| commit | a77cdfd8eaf9e51bf2a3cccb7d0a2c83b14ef28c (patch) | |
| tree | 3cbb36cfbd8a02b692109a854dd4210cbc8a2016 /src/Makefile.am | |
| parent | e0cc3cab40349e9d7587be79e17f104bf5266a5d (diff) | |
| parent | 73f4d4e7e1c6a5db370848797923481a7ee4ef43 (diff) | |
| download | ayatana-indicator-session-a77cdfd8eaf9e51bf2a3cccb7d0a2c83b14ef28c.tar.gz ayatana-indicator-session-a77cdfd8eaf9e51bf2a3cccb7d0a2c83b14ef28c.tar.bz2 ayatana-indicator-session-a77cdfd8eaf9e51bf2a3cccb7d0a2c83b14ef28c.zip | |
Merge lp:~bratsche/indicator-session/users-service for bug #422052
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ae941e1..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,6 +26,10 @@ 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 \ @@ -42,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 \ @@ -56,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 \ @@ -90,7 +112,7 @@ status-provider-mc5-marshal.c: $(srcdir)/status-provider-mc5.list # 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) @@ -107,10 +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 \ |