diff options
| author | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-12-12 13:32:00 +0000 |
|---|---|---|
| committer | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-12-12 13:32:00 +0000 |
| commit | 2d9a7c6e1322e21a8de3f334df5377dfe1ef1e2d (patch) | |
| tree | 021ffffe134fe2a0635a6be4fad86cd23884aa1a | |
| parent | 9079bd8794436a3e2a6e16481c8b90ff9e8284fb (diff) | |
| download | telepathy-gabble-2d9a7c6e1322e21a8de3f334df5377dfe1ef1e2d.tar.gz | |
merge Makefile.am conflicts
20061212133200-418b8-e798026c7c4fde92b23028a69ac80b6e900244f0.gz
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 77a3bb1a2..39def38e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -120,7 +120,10 @@ libgabble_convenience_la_SOURCES = \ tp-channel-factory-iface.c \ util.h \ util.c \ - $(BUILT_SOURCES) + vcard-manager.h \ + vcard-manager.c \ + libmd5-rfc/md5.c \ + libmd5-rfc/md5.h \ EXTRA_DIST = \ gabble-connection-manager-signals-marshal.list \ |