From c6055d45604745ac063db2d1daf8207df5c7fad5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Jun 2011 15:42:44 -0500 Subject: Stealing all of the status providers from indicator-me so that we can use them here. --- src/Makefile.am | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 153 insertions(+), 6 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 8597d77..8e4f170 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,14 @@ +BUILT_SOURCES = +EXTRA_DIST = + libexec_PROGRAMS = indicator-messages-service +STATUS_PROVIDER_API_VERSION = 1 +STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/ +statusprovidersdir = $(STATUS_PROVIDER_DIR) +statusproviders_LTLIBRARIES = + ###################################### # Building the messages indicator ###################################### @@ -44,7 +52,11 @@ indicator_messages_service_SOURCES = \ seen-db.c \ seen-db.h \ dirs.h \ - dbus-data.h + dbus-data.h \ + \ + status-provider.c \ + status-provider.h + indicator_messages_service_CFLAGS = \ $(APPLET_CFLAGS) \ -Wall \ @@ -52,7 +64,9 @@ indicator_messages_service_CFLAGS = \ -Wl,-z,defs \ -Wl,--as-needed \ -Werror \ - -DG_LOG_DOMAIN=\"Indicator-Messages\" + -DG_LOG_DOMAIN=\"Indicator-Messages\" \ + -DSTAUTS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\" + indicator_messages_service_LDADD = $(APPLET_LIBS) gen-%.xml.h: %.xml @@ -65,13 +79,146 @@ gen-%.xml.c: %.xml @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ -BUILT_SOURCES = \ +BUILT_SOURCES += \ gen-messages-service.xml.h \ gen-messages-service.xml.c +EXTRA_DIST += \ + messages-service.xml + +###################################### +# Status provider: Pidgin +###################################### + +statusproviders_LTLIBRARIES += libpidgin.la +libpidgin_la_SOURCES = \ + status-provider-pidgin.h \ + status-provider-pidgin.c \ + status-provider-pidgin-marshal.h \ + status-provider-pidgin-marshal.c +libpidgin_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + $(STATUS_PROVIDER_PIDGIN_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Status-Provider-Pidgin\" +libpidgin_la_LIBADD = \ + $(APPLET_LIBS) \ + $(STATUS_PROVIDER_PIDGIN_LIBS) +libpidgin_la_LDFLAGS = -module -avoid-version + +status-provider-pidgin-marshal.h: $(srcdir)/status-provider-pidgin.list + glib-genmarshal --header \ + --prefix=_status_provider_pidgin_marshal $(srcdir)/status-provider-pidgin.list \ + > status-provider-pidgin-marshal.h + +status-provider-pidgin-marshal.c: $(srcdir)/status-provider-pidgin.list + glib-genmarshal --body \ + --prefix=_status_provider_pidgin_marshal $(srcdir)/status-provider-pidgin.list \ + > status-provider-pidgin-marshal.c + +BUILT_SOURCES += \ + status-provider-pidgin-marshal.h \ + status-provider-pidgin-marshal.c + +EXTRA_DIST += \ + status-provider-pidgin.list + +###################################### +# Status provider: Mission Control 4 +###################################### + +statusproviders_LTLIBRARIES += libtelepathy.la +libtelepathy_la_SOURCES = \ + status-provider-telepathy.h \ + status-provider-telepathy.c \ + status-provider-telepathy-marshal.h \ + status-provider-telepathy-marshal.c +libtelepathy_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + $(STATUS_PROVIDER_TELEPATHY_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Status-Provider-Telepathy\" +libtelepathy_la_LIBADD = \ + $(APPLET_LIBS) \ + $(STATUS_PROVIDER_TELEPATHY_LIBS) +libtelepathy_la_LDFLAGS = -module -avoid-version + +status-provider-telepathy-marshal.h: $(srcdir)/status-provider-telepathy.list + glib-genmarshal --header \ + --prefix=_status_provider_telepathy_marshal $(srcdir)/status-provider-telepathy.list \ + > status-provider-telepathy-marshal.h + +status-provider-telepathy-marshal.c: $(srcdir)/status-provider-telepathy.list + glib-genmarshal --body \ + --prefix=_status_provider_telepathy_marshal $(srcdir)/status-provider-telepathy.list \ + > status-provider-telepathy-marshal.c + +BUILT_SOURCES += \ + status-provider-telepathy-marshal.h \ + status-provider-telepathy-marshal.c + +EXTRA_DIST += \ + status-provider-telepathy.list + +###################################### +# Status provider: Mission Control 5 +###################################### + +statusproviders_LTLIBRARIES += libmc5.la +libmc5_la_SOURCES = \ + status-provider-mc5.h \ + status-provider-mc5.c \ + status-provider-mc5-marshal.h \ + status-provider-mc5-marshal.c +libmc5_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + $(STATUS_PROVIDER_MC5_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Status-Provider-MC5\" +libmc5_la_LIBADD = \ + $(APPLET_LIBS) \ + $(STATUS_PROVIDER_MC5_LIBS) +libmc5_la_LDFLAGS = -module -avoid-version + +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 + +BUILT_SOURCES += \ + status-provider-mc5-marshal.h \ + status-provider-mc5-marshal.c + +EXTRA_DIST += \ + status-provider-mc5.list + +###################################### +# Status provider: Emesene +###################################### + +statusproviders_LTLIBRARIES += libemesene.la +libemesene_la_SOURCES = \ + status-provider-emesene.h \ + status-provider-emesene.c +libemesene_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + $(STATUS_PROVIDER_EMESENE_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Status-Provider-Emesene\" +libemesene_la_LIBADD = \ + $(APPLET_LIBS) \ + $(STATUS_PROVIDER_EMESENE_LIBS) +libemesene_la_LDFLAGS = -module -avoid-version + +###################################### +# Extras +###################################### + CLEANFILES = \ $(BUILT_SOURCES) -EXTRA_DIST = \ - messages-service.xml - -- cgit v1.2.3 From f1e975ba53b6bc180a0a55ef7db64c9371c15f44 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 28 Jun 2011 14:26:39 -0500 Subject: Adding in some helpers with building up all the status-items. --- 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 8e4f170..4f654da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,6 +54,8 @@ indicator_messages_service_SOURCES = \ dirs.h \ dbus-data.h \ \ + status-items.c \ + status-items.h status-provider.c \ status-provider.h -- cgit v1.2.3 From 1ee7d8ddc51a65bb14f4a294abd7024fda5c11b3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 28 Jun 2011 15:58:48 -0500 Subject: Adding in an idle function for handling the 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 4f654da..de4fccb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,7 +67,7 @@ indicator_messages_service_CFLAGS = \ -Wl,--as-needed \ -Werror \ -DG_LOG_DOMAIN=\"Indicator-Messages\" \ - -DSTAUTS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\" + -DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\" indicator_messages_service_LDADD = $(APPLET_LIBS) -- cgit v1.2.3 From 782c36c2ccf01dd0db6cbac8cc712cc316f23c90 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 2 Jul 2011 07:15:22 -0500 Subject: Loading the modules and getting an 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 de4fccb..87f3c67 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,7 +55,7 @@ indicator_messages_service_SOURCES = \ dbus-data.h \ \ status-items.c \ - status-items.h + status-items.h \ status-provider.c \ status-provider.h -- cgit v1.2.3 From 0b32b5d893fbd6685bb1b900d744a5d320796def Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 2 Jul 2011 07:44:18 -0500 Subject: Breaking the status provider base objec out into it's own library --- src/Makefile.am | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 87f3c67..51551ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,10 +4,6 @@ EXTRA_DIST = libexec_PROGRAMS = indicator-messages-service -STATUS_PROVIDER_API_VERSION = 1 -STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/ -statusprovidersdir = $(STATUS_PROVIDER_DIR) -statusproviders_LTLIBRARIES = ###################################### # Building the messages indicator @@ -55,9 +51,7 @@ indicator_messages_service_SOURCES = \ dbus-data.h \ \ status-items.c \ - status-items.h \ - status-provider.c \ - status-provider.h + status-items.h indicator_messages_service_CFLAGS = \ $(APPLET_CFLAGS) \ @@ -69,7 +63,9 @@ indicator_messages_service_CFLAGS = \ -DG_LOG_DOMAIN=\"Indicator-Messages\" \ -DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\" -indicator_messages_service_LDADD = $(APPLET_LIBS) +indicator_messages_service_LDADD = \ + $(APPLET_LIBS) \ + libindicator-messages-status-provider.la gen-%.xml.h: %.xml @echo "Building $@ from $<" @@ -88,6 +84,40 @@ BUILT_SOURCES += \ EXTRA_DIST += \ messages-service.xml +###################################### +# Status Provider Library +###################################### + +STATUS_PROVIDER_API_VERSION = 1 +STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/ +statusprovidersdir = $(STATUS_PROVIDER_DIR) +statusproviders_LTLIBRARIES = + +lib_LTLIBRARIES = \ + libindicator-messages-status-provider.la + +libindicator_messages_status_provider_la_HEADERS = \ + status-provider.h + +libindicator_messages_status_provider_la_SOURCES = \ + $(libindicator_messages_status_provider_HEADERS) \ + status-provider.c + +libindicator_messages_status_provider_ladir = \ + $(includedir)/libindicator-messages-status-provider-$(STATUS_PROVIDER_API_VERSION)/ + +libindicator_messages_status_provider_la_LDFLAGS = \ + -version-info $(STATUS_PROVIDER_API_VERSION):0:0 \ + -no-undefined \ + -export-symbols-regex "^[^_].*" + +libindicator_messages_status_provider_la_LIBADD = \ + $(APPLET_LIBS) + +libindicator_messages_status_provider_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall -Werror + ###################################### # Status provider: Pidgin ###################################### @@ -104,6 +134,7 @@ libpidgin_la_CFLAGS = \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Status-Provider-Pidgin\" libpidgin_la_LIBADD = \ + libindicator-messages-status-provider.la \ $(APPLET_LIBS) \ $(STATUS_PROVIDER_PIDGIN_LIBS) libpidgin_la_LDFLAGS = -module -avoid-version @@ -141,6 +172,7 @@ libtelepathy_la_CFLAGS = \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Status-Provider-Telepathy\" libtelepathy_la_LIBADD = \ + libindicator-messages-status-provider.la \ $(APPLET_LIBS) \ $(STATUS_PROVIDER_TELEPATHY_LIBS) libtelepathy_la_LDFLAGS = -module -avoid-version @@ -178,6 +210,7 @@ libmc5_la_CFLAGS = \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Status-Provider-MC5\" libmc5_la_LIBADD = \ + libindicator-messages-status-provider.la \ $(APPLET_LIBS) \ $(STATUS_PROVIDER_MC5_LIBS) libmc5_la_LDFLAGS = -module -avoid-version @@ -213,6 +246,7 @@ libemesene_la_CFLAGS = \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Status-Provider-Emesene\" libemesene_la_LIBADD = \ + libindicator-messages-status-provider.la \ $(APPLET_LIBS) \ $(STATUS_PROVIDER_EMESENE_LIBS) libemesene_la_LDFLAGS = -module -avoid-version -- cgit v1.2.3 From 357324760c1d7391276a25a83ecd1f83bea9aa7b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 2 Jul 2011 10:05:14 -0500 Subject: The trailing slash makes distcheck fail. No really. --- 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 51551ba..62159cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST += \ ###################################### STATUS_PROVIDER_API_VERSION = 1 -STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/ +STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION) statusprovidersdir = $(STATUS_PROVIDER_DIR) statusproviders_LTLIBRARIES = -- cgit v1.2.3 From 3e9685c57d9df7a353431d0b89138309816dee5b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Jul 2011 14:46:06 -0500 Subject: Making a pkgconfig file for the status providers --- src/Makefile.am | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 62159cb..c631436 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ BUILT_SOURCES = EXTRA_DIST = +CLEANFILES = +DISTCLEANFILES = libexec_PROGRAMS = indicator-messages-service @@ -93,6 +95,20 @@ STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSI statusprovidersdir = $(STATUS_PROVIDER_DIR) statusproviders_LTLIBRARIES = +EXTRA_DIST += \ + indicator-messages-status-provider-0.5.pc.in.in +CLEANFILES += \ + indicator-messages-status-provider-0.5.pc + +pkgconfig_DATA = indicator-messages-status-provider-0.5.pc +pkgconfigdir = $(libdir)/pkgconfig + +%.pc: %.pc.in + sed \ + -e "s|\@status_provider_dir\@|$(STATUS_PROVIDER_DIR)|" \ + -e "s|\@status_provider_api_version\@|$(STATUS_PROVIDER_API_VERSION)|" \ + $< > $@ + lib_LTLIBRARIES = \ libindicator-messages-status-provider.la @@ -255,6 +271,6 @@ libemesene_la_LDFLAGS = -module -avoid-version # Extras ###################################### -CLEANFILES = \ +CLEANFILES += \ $(BUILT_SOURCES) -- cgit v1.2.3