From 7b2c29fbd83d2679a123a8825c92b3ac97e79229 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:16:49 -0500 Subject: Getting to building all these header files nicely. --- src/Makefile.am | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 63f0c64..ae83eb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,4 @@ -libexec_PROGRAMS = indicator-custom-service - ################################## # Indicator ################################## @@ -22,10 +20,42 @@ libcustom_la_LDFLAGS = -module -avoid-version # Service ################################## +libexec_PROGRAMS = indicator-custom-service + indicator_custom_service_SOURCES = \ - custom-service.c + custom-service.c \ + notification-item-client.h \ + notification-watcher-server.h indicator_custom_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ -Wall -Werror indicator_custom_service_LDADD = \ $(INDICATOR_LIBS) + +################################## +# DBus Specs +################################## + +DBUS_SPECS = \ + notification-item.xml \ + notification-watcher.xml + +%-client.h: %.xml + dbus-binding-tool \ + --prefix=_$(<:.xml=)_client \ + --mode=glib-client \ + --output=$@ \ + $< + +%-server.h: %.xml + dbus-binding-tool \ + --prefix=_$(<:.xml=)_server \ + --mode=glib-server \ + --output=$@ \ + $< + +BUILT_SOURCES = \ + $(DBUS_SPECS:.xml=-client.h) \ + $(DBUS_SPECS:.xml=-server.h) + +DIST_CLEAN = $(BUILT_SOURCES) -- cgit v1.2.3 From 17192c26de5cc0662c218196ef4b53ebaf1eef0b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:19:39 -0500 Subject: Fixing symbol names. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index ae83eb3..23235c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,14 +42,14 @@ DBUS_SPECS = \ %-client.h: %.xml dbus-binding-tool \ - --prefix=_$(<:.xml=)_client \ + --prefix=_$(subst -,_,$(<:.xml=))_client \ --mode=glib-client \ --output=$@ \ $< %-server.h: %.xml dbus-binding-tool \ - --prefix=_$(<:.xml=)_server \ + --prefix=_$(subst -,_,$(<:.xml=))_server \ --mode=glib-server \ --output=$@ \ $< -- cgit v1.2.3 From df1cc80c7f1ac98fd298631c7555663dd144df73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Oct 2009 22:26:35 -0500 Subject: Making sure we get our specs and clean up after ourselves. Distcheck magic. --- src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 23235c5..2139b62 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,4 +58,6 @@ BUILT_SOURCES = \ $(DBUS_SPECS:.xml=-client.h) \ $(DBUS_SPECS:.xml=-server.h) -DIST_CLEAN = $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) + +EXTRA_DIST = $(DBUS_SPECS) -- cgit v1.2.3