diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-08-18 08:10:00 +0800 |
---|---|---|
committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-08-18 08:10:00 +0800 |
commit | 2021c145e0c5eb6aa9eda91d58d54b13007113ad (patch) | |
tree | ab6b5ba09764a785e8c06efae2f69dca111089be /src/Makefile.am | |
parent | d3e8563fe9b3d3c0b5ee5f225964b8078e18d1e6 (diff) | |
parent | dc7080f5071a9130bbd9288b50f807b41a5f9864 (diff) | |
download | gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.gz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.bz2 gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.lz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.xz gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.tar.zst gsoc2013-empathy-2021c145e0c5eb6aa9eda91d58d54b13007113ad.zip |
Merge branch 'log-window-webview'
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cf5069fc6..0232ffe0a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,6 @@ AM_LDFLAGS = -lm AM_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ $(LIBCHAMPLAIN_CFLAGS) \ - $(WEBKIT_CFLAGS) \ $(NULL) LDADD = \ @@ -27,7 +26,7 @@ LDADD = \ $(EMPATHY_LIBS) \ $(YELL_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ - $(WEBKIT_LIBS) + $(NULL) noinst_LTLIBRARIES = libempathy-accounts-common.la @@ -47,7 +46,6 @@ libempathy_accounts_common_la_LIBADD = \ $(EDS_LIBS) \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ - $(WEBKIT_LIBS) \ $(NULL) if HAVE_CONTROL_CENTER_EMBEDDING @@ -216,7 +214,6 @@ empathy_LDADD = \ $(top_builddir)/extensions/libemp-extensions.la \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ - $(WEBKIT_LIBS) \ $(NULL) nodist_empathy_SOURCES = $(BUILT_SOURCES) |