diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 15:34:13 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 15:34:13 +0100 |
| commit | 23203206ccdb31717624a930f0f94d79b2b28819 (patch) | |
| tree | cce13e8e351bda149e9f3687dcaddc2299a23bd5 /telepathy-glib/Makefile.am | |
| parent | c3d3f29a61886f87f16e1c335aabc506b2b6beb3 (diff) | |
| parent | a95806d419ba88a57a1f5793e86bfe99a0d4dc02 (diff) | |
Merge branch 'master' into next
Conflicts:
docs/reference/telepathy-glib-sections.txt
examples/client/approver.c
examples/cm/call/call-manager.c
examples/cm/call/conn.c
examples/cm/channelspecific/conn.c
examples/cm/channelspecific/room.c
examples/cm/contactlist/conn.c
examples/cm/echo-message-parts/chan.c
examples/cm/echo-message-parts/conn.c
examples/cm/extended/conn.c
telepathy-glib/Makefile.am
telepathy-glib/base-contact-list-internal.h
telepathy-glib/contact.h
telepathy-glib/dbus-properties-mixin-internal.h
telepathy-glib/telepathy-glib-dbus.h
telepathy-glib/telepathy-glib.h
tools/glib-client-gen.py
Diffstat (limited to 'telepathy-glib/Makefile.am')
| -rw-r--r-- | telepathy-glib/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index 02e1e3321..eb447c863 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -335,8 +335,12 @@ libtelepathy_glib_reentrants_la_SOURCES = \ reentrants.c \ reentrants.h -AM_CFLAGS = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"tp-glib\" \ + -D_TP_COMPILATION \ + $(NULL) + +AM_CFLAGS = \ $(ERROR_CFLAGS) \ @DBUS_CFLAGS@ \ @GLIB_CFLAGS@ \ |