[telepathy-gabble/master] src/Makefile.am: use phony targets properly when ensuring gibber is built
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Jul 28 15:19:58 PDT 2009
This avoids relinking Gabble *every* *single* *time*, which was annoying
me. To be honest I'm not sure we need this block at all - the only people
it helps are those who use "make -C src" either initially or after
changing something in lib, and I assert that those people are strange :-P
---
src/Makefile.am | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 208f14c..762967c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,7 +138,6 @@ libgabble_convenience_la_SOURCES = \
vcard-manager.h \
vcard-manager.c
-
libgabble_convenience_la_LIBADD = \
$(top_builddir)/extensions/libgabble-extensions.la \
$(top_builddir)/lib/gibber/libgibber.la \
@@ -175,11 +174,11 @@ AM_CFLAGS = $(ERROR_CFLAGS) -I$(top_srcdir) -I$(top_builddir) \
ALL_LIBS = @DBUS_LIBS@ @GLIB_LIBS@ @LOUDMOUTH_LIBS@ @TP_GLIB_LIBS@ \
@SOUP_LIBS@ @UUID_LIBS@
-# Teach it how to make libgibber.la
-$(top_builddir)/lib/gibber/libgibber.la:
+# build gibber first
+all: gibber
+gibber:
${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
-
-.PHONY: $(top_builddir)/lib/gibber/libgibber.la
+.PHONY: gibber
gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
@( cd $(srcdir) && \
--
1.5.6.5
More information about the telepathy-commits
mailing list