From d68a776f7c88fc1304572e4739a65ee1b93688e4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Jun 2009 14:45:38 -0500 Subject: Switching the pkgconfig based directory. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index c29d179..3bae3f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -fusalibdir = $(libdir)/indicators/1 +fusalibdir = $(INDICATORDIR) fusalib_LTLIBRARIES = libfusa.la libfusa_la_SOURCES = indicator-fusa.c libfusa_la_CFLAGS = $(APPLET_CFLAGS) -- cgit v1.2.3 From 80b3de3f554b9d9fc60d20c4835026017465b61c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Jun 2009 16:25:14 -0500 Subject: Making things into a set of three user-daemons. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 3bae3f2..325e351 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,5 +2,5 @@ fusalibdir = $(INDICATORDIR) fusalib_LTLIBRARIES = libfusa.la libfusa_la_SOURCES = indicator-fusa.c -libfusa_la_CFLAGS = $(APPLET_CFLAGS) +libfusa_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libfusa_la_LIBADD = $(APPLET_LIBS) -- cgit v1.2.3 From 770526c7bb912c8f04a82293c6d49e1c060edeb7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Jun 2009 16:57:56 -0500 Subject: Changing the name to get rid of FUSA, which doesn't really make sense anymore. --- src/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 325e351..45400c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ -fusalibdir = $(INDICATORDIR) -fusalib_LTLIBRARIES = libfusa.la -libfusa_la_SOURCES = indicator-fusa.c -libfusa_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -libfusa_la_LIBADD = $(APPLET_LIBS) +status_users_sessionlibdir = $(INDICATORDIR) +status_users_sessionlib_LTLIBRARIES = libstatus-users-session.la +libstatus_users_session_la_SOURCES = indicator-fusa.c +libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror +libstatus_users_session_la_LIBADD = $(APPLET_LIBS) -- cgit v1.2.3 From a94e5d414a44af3c3f4ae2bb0c00978c0270dd1a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Jun 2009 16:59:12 -0500 Subject: Renaming the C file as well. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 45400c3..4fe35ff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ status_users_sessionlibdir = $(INDICATORDIR) status_users_sessionlib_LTLIBRARIES = libstatus-users-session.la -libstatus_users_session_la_SOURCES = indicator-fusa.c +libstatus_users_session_la_SOURCES = indicator-sus.c dbus-shared-names.h libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) -- cgit v1.2.3 From 1e2d4592308c3bff63c74c48b9e97b6d246d2b92 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Jun 2009 10:59:51 -0500 Subject: Now we're building services. Snazy. --- src/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 4fe35ff..4e0df47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,15 @@ +libexec_PROGRAMS = indicator-status-service indicator-users-service indicator-session-service + status_users_sessionlibdir = $(INDICATORDIR) status_users_sessionlib_LTLIBRARIES = libstatus-users-session.la libstatus_users_session_la_SOURCES = indicator-sus.c dbus-shared-names.h libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) + +indicator_status_service_SOURCES = status-service.c + +indicator_users_service_SOURCES = users-service.c + +indicator_session_service_SOURCES = session-service.c + -- cgit v1.2.3 From ee013228b486d5b49be2737e90f3e75aded90365 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Jun 2009 16:53:00 -0500 Subject: Adding more dependencies and cflags and stuff to make the builds of the services more complete --- src/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 4e0df47..86bacb8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,14 @@ libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) indicator_status_service_SOURCES = status-service.c +indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) +indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) indicator_users_service_SOURCES = users-service.c +indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) +indicator_users_service_LDADD = $(USERSSERVICE_LIBS) indicator_session_service_SOURCES = session-service.c +indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) +indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) -- cgit v1.2.3 From 3fc5dff1de2389211bae97ba54db3c1370dbab0c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Jun 2009 10:20:46 -0500 Subject: Adding in the basic (generated) framework for the status provider object --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 86bacb8..df51cf5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ libstatus_users_session_la_SOURCES = indicator-sus.c dbus-shared-names.h libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) -indicator_status_service_SOURCES = status-service.c +indicator_status_service_SOURCES = status-service.c status-provider.h status-provider.c indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) -- cgit v1.2.3 From 963f1418caa6b438d80445b2eb66f5b42e5add06 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Jun 2009 14:47:42 -0500 Subject: Preliminary pidgin wrappers. --- src/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index df51cf5..a5380ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,11 @@ libstatus_users_session_la_SOURCES = indicator-sus.c dbus-shared-names.h libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) -indicator_status_service_SOURCES = status-service.c status-provider.h status-provider.c +indicator_status_service_SOURCES = status-service.c \ + status-provider.h \ + status-provider.c \ + status-provider-pidgin.h \ + status-provider-pidgin.c indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) -- cgit v1.2.3 From d9116a6713e4a7d5bdbf10ba96fc3d34caf4f5eb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Jun 2009 16:20:47 -0500 Subject: Adding a DBus interface for the status specific stuff --- src/Makefile.am | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index a5380ac..a6ce265 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,14 +7,31 @@ libstatus_users_session_la_SOURCES = indicator-sus.c dbus-shared-names.h libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) -indicator_status_service_SOURCES = status-service.c \ - status-provider.h \ - status-provider.c \ - status-provider-pidgin.h \ - status-provider-pidgin.c +indicator_status_service_SOURCES = \ + status-service.c \ + status-service-client.h \ + status-service-server.h \ + status-provider.h \ + status-provider.c \ + status-provider-pidgin.h \ + status-provider-pidgin.c indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) +status-service-client.h: status-service.xml + dbus-binding-tool \ + --prefix=_status_service_client \ + --mode=glib-client \ + --output=status-service-client.h \ + $(srcdir)/status-service.xml + +status-service-server.h: status-service.xml + dbus-binding-tool \ + --prefix=_status_service_server \ + --mode=glib-server \ + --output=status-service-server.h \ + $(srcdir)/status-service.xml + indicator_users_service_SOURCES = users-service.c indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) indicator_users_service_LDADD = $(USERSSERVICE_LIBS) @@ -23,3 +40,9 @@ indicator_session_service_SOURCES = session-service.c indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) +BUILT_SOURCES = \ + status-service-client.h \ + status-service-server.h + +EXTRA_DIST = \ + status-service.xml -- cgit v1.2.3 From 92632f9ebdf278b654c6ad99eabab826e4b32cac Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Jun 2009 16:31:10 -0500 Subject: Actually the client is the indicator. Silly to have one binary be both client and server, heh. --- src/Makefile.am | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index a6ce265..a6a4dd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,15 +1,25 @@ libexec_PROGRAMS = indicator-status-service indicator-users-service indicator-session-service +################### +# Indicator Stuff +################### + status_users_sessionlibdir = $(INDICATORDIR) status_users_sessionlib_LTLIBRARIES = libstatus-users-session.la -libstatus_users_session_la_SOURCES = indicator-sus.c dbus-shared-names.h +libstatus_users_session_la_SOURCES = \ + indicator-sus.c \ + dbus-shared-names.h \ + status-service-client.h libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror libstatus_users_session_la_LIBADD = $(APPLET_LIBS) +################ +# Status Stuff +################ + indicator_status_service_SOURCES = \ status-service.c \ - status-service-client.h \ status-service-server.h \ status-provider.h \ status-provider.c \ @@ -32,14 +42,26 @@ status-service-server.h: status-service.xml --output=status-service-server.h \ $(srcdir)/status-service.xml +############### +# Users Stuff +############### + indicator_users_service_SOURCES = users-service.c indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) indicator_users_service_LDADD = $(USERSSERVICE_LIBS) +################# +# Session Stuff +################# + indicator_session_service_SOURCES = session-service.c indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) +############### +# Other Stuff +############### + BUILT_SOURCES = \ status-service-client.h \ status-service-server.h -- cgit v1.2.3 From 9eb765152122a08ddfa95b150d9a7d5c46559356 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 12 Jun 2009 16:56:08 -0500 Subject: A quickly little object to put itself on DBus. --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index a6a4dd5..1965fe9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,8 @@ libstatus_users_session_la_LIBADD = $(APPLET_LIBS) indicator_status_service_SOURCES = \ status-service.c \ + status-service-dbus.h \ + status-service-dbus.c \ status-service-server.h \ status-provider.h \ status-provider.c \ -- cgit v1.2.3