diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-11 16:17:09 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-08-11 16:17:09 +0100 |
| commit | fb865d918fa135d03451ccc56cd7bc6ea127c639 (patch) | |
| tree | 23532cfeda800e8f5a6b4c7662990ec5857a8f25 /server | |
| parent | 4e75c43eca3737f2501e46bda0b74e9478637ac5 (diff) | |
| download | telepathy-mission-control-fb865d918fa135d03451ccc56cd7bc6ea127c639.tar.gz | |
server, util: fix CPPFLAGS/LDADD for recent ld versions
- use AM_CPPFLAGS instead of the deprecated equivalent INCLUDES
- use GLIB_CFLAGS but not DBUS_CFLAGS (mc-server.c doesn't actually use
any dbus-glib functionality directly; neither do the utils)
- put our own include directories first, then everything else in stack
order, lowest first
- explicitly link against telepathy-glib and GLib, since we use their
symbols (fixes linking with gold(1))
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 8d5bc2b2..d24ee20a 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,6 +1,9 @@ -INCLUDES = $(DBUS_CFLAGS) $(TELEPATHY_CFLAGS) -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + $(GLIB_CFLAGS) \ + $(TELEPATHY_CFLAGS) \ -DMC_DISABLE_DEPRECATED \ -DLIBDIR="@libdir@" -DLIBVERSION="0" @@ -29,6 +32,9 @@ man8_MANS = mission-control-5.8 libexec_PROGRAMS = mission-control-5 mission_control_5_SOURCES = mc-server.c -mission_control_5_LDADD = $(top_builddir)/src/libmissioncontrol-server.la +mission_control_5_LDADD = \ + $(GLIB_LIBS) \ + $(TELEPATHY_LIBS) \ + $(top_builddir)/src/libmissioncontrol-server.la endif |