diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-02-26 16:49:16 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-02-26 16:49:16 +0800 |
commit | 04a3f49597c3ffb367b48fe6c01f972bdd15ea11 (patch) | |
tree | 71365ef368afa72968af8bff1b41d8c0665d1009 /src/Makefile.am | |
parent | e86aa1065dbf60d7a1e68bf50d9fbbccbb34312a (diff) | |
parent | 28244a9c41e2c4274d2cb298c20b5e8909f7578a (diff) | |
download | gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.gz gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.bz2 gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.lz gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.xz gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.tar.zst gsoc2013-empathy-04a3f49597c3ffb367b48fe6c01f972bdd15ea11.zip |
Merge commit 'ka/empathy-tpl-20100225-ifdef'
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9460fc959..3f8d15733 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,7 @@ CPPFLAGS_COMMON = \ AM_LDFLAGS = -lm AM_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ + $(TPL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(WEBKIT_CFLAGS) \ @@ -22,6 +23,7 @@ LDADD = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/extensions/libemp-extensions.la \ + $(TPL_LIBS) \ $(LIBNOTIFY_LIBS) \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ |