summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-03-17 13:42:22 +1100
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-07-19 13:51:56 +0100
commit30b0ce878d6cb3837b9cd207eb98f873ed553dbf (patch)
tree8bab258a61937215ab1d408ca3abb55501b3870f
parente33326c778398a954e16e33e338eb9bf1ff6ef14 (diff)
downloadtelepathy-logger-30b0ce878d6cb3837b9cd207eb98f873ed553dbf.tar.gz
Add GLib marshaller generation boilerplate
-rw-r--r--.gitignore2
-rw-r--r--telepathy-logger/Makefile.am18
-rw-r--r--telepathy-logger/tpl-marshal.list1
3 files changed, 19 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5a30316..547ea33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,8 @@ Makefile.in
/telepathy-logger/telepathy-logger-0.1-uninstalled.pc
/telepathy-logger/telepathy-logger-0.1.pc
/telepathy-logger/_gen/*
+/telepathy-logger/tpl-marshal.c
+/telepathy-logger/tpl-marshal.h
/tests/test-*[^ch]
/tests/twisted/config.py
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 736e0c1..3a5f445 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
-BUILT_SOURCES =
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = telepathy-logger-0.1.pc
@@ -26,6 +24,17 @@ LIBTPL_HEADERS = \
telepathy-logger.h \
$(NULL)
+%-marshal.c: %-marshal.list Makefile.am
+ $(QUIET_GEN)echo "#include \"tpl-marshal.h\"" > $@
+ $(QUIET_GEN)glib-genmarshal --body --prefix=tpl_marshal $< >> $@
+
+%-marshal.h: %-marshal.list Makefile.am
+ $(QUIET_GEN)glib-genmarshal --header --prefix=tpl_marshal $< > $@
+
+BUILT_SOURCES = \
+ tpl-marshal.c tpl-marshal.h \
+ $(NULL)
+
libtelepathy_logger_la_SOURCES = \
action-chain.c \
action-chain-internal.h \
@@ -63,8 +72,13 @@ libtelepathy_logger_la_SOURCES = \
observer-internal.h \
util-internal.h \
util.c \
+ $(BUILT_SOURCES)
$(NULL)
+EXTRA_DIST = \
+ tpl-marshal.list \
+ $(NULL)
+
libtelepathy_logger_la_LIBADD = \
$(top_builddir)/extensions/libtpl-extensions-convenience.la
diff --git a/telepathy-logger/tpl-marshal.list b/telepathy-logger/tpl-marshal.list
new file mode 100644
index 0000000..cd48853
--- /dev/null
+++ b/telepathy-logger/tpl-marshal.list
@@ -0,0 +1 @@
+VOID:POINTER,POINTER