aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am30
-rw-r--r--src/app-indicator.c8
2 files changed, 20 insertions, 18 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 673938b..5b6adc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,10 +62,10 @@ libappindicator_la_SOURCES = \
dbus-shared.h \
generate-id.h \
generate-id.c \
- notification-item.xml.h \
- notification-item.xml.c \
- notification-watcher.xml.h \
- notification-watcher.xml.c
+ gen-notification-item.xml.h \
+ gen-notification-item.xml.c \
+ gen-notification-watcher.xml.h \
+ gen-notification-watcher.xml.c
libappindicator_la_LDFLAGS = \
-version-info 1:0:0 \
@@ -99,25 +99,27 @@ DBUS_SPECS = \
notification-item.xml \
notification-watcher.xml
-%.xml.h: %.xml
+gen-%.xml.h: %.xml
@echo "Building $@ from $<"
- @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@
+ @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $<)));" > $@
-%.xml.c: %.xml
+gen-%.xml.c: %.xml
@echo "Building $@ from $<"
- @echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@
+ @echo "const char * $(subst -,_,$(subst .,_,$(basename $<))) = " > $@
@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
@echo ";" >> $@
BUILT_SOURCES += \
- notification-item.xml.c \
- notification-item.xml.h \
- notification-watcher.xml.c \
- notification-watcher.xml.h
+ gen-notification-item.xml.c \
+ gen-notification-item.xml.h \
+ gen-notification-watcher.xml.c \
+ gen-notification-watcher.xml.h
CLEANFILES += \
- $(DBUS_SPECS:.xml=.xml.h) \
- $(DBUS_SPECS:.xml=.xml.c)
+ gen-notification-item.xml.c \
+ gen-notification-item.xml.h \
+ gen-notification-watcher.xml.c \
+ gen-notification-watcher.xml.h
EXTRA_DIST += $(DBUS_SPECS)
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 0b31018..0d469ac 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -48,8 +48,8 @@ License version 3 and version 2.1 along with this program. If not, see
#include "app-indicator-enum-types.h"
#include "application-service-marshal.h"
-#include "notification-watcher.xml.h"
-#include "notification-item.xml.h"
+#include "gen-notification-watcher.xml.h"
+#include "gen-notification-item.xml.h"
#include "dbus-shared.h"
#include "generate-id.h"
@@ -561,7 +561,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
if (item_node_info == NULL) {
GError * error = NULL;
- item_node_info = g_dbus_node_info_new_for_xml(notification_item_xml, &error);
+ item_node_info = g_dbus_node_info_new_for_xml(notification_item, &error);
if (error != NULL) {
g_error("Unable to parse Notification Item DBus interface: %s", error->message);
g_error_free(error);
@@ -579,7 +579,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
if (watcher_node_info == NULL) {
GError * error = NULL;
- watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher_xml, &error);
+ watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher, &error);
if (error != NULL) {
g_error("Unable to parse Notification Item DBus interface: %s", error->message);
g_error_free(error);