Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1b3d27ef24a9e2e59a63c7efaf6c7a504afbccf4..8faaa1106233f15248412840d7227f2f6948fa49 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,23 @@
 
 bin_PROGRAMS = abook
 
+if ENABLE_VFORMAT_SUPPORT
+vformat_SOURCE = vcard.c vcard.h
+AM_LDFLAGS = -lvformat
+else
+vformat_SOURCE =
+endif
+
 abook_SOURCES = abook.c abook_rl.c database.c edit.c \
                filter.c getname.c getopt.c getopt1.c gettext.c \
                ldif.c list.c mbswidth.c misc.c options.c \
                ui.c views.c xmalloc.c \
                \
-               abook.h abook_curses.h abook_rl.h database.h edit.h \
+               abook.h abook_curses.h abook_rl.h database.h edit.h \
                filter.h getname.h getopt.h gettext.h \
                help.h list.h ldif.h mbswidth.h misc.h options.h \
-               ui.h views.h xmalloc.h
+               ui.h views.h xmalloc.h \
+               $(vformat_SOURCE)
 
 EXTRA_DIST = config.rpath  ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc \
                abook.spec contrib doc/HOWTO.translating_abook RELEASE_NOTES
@@ -27,7 +35,7 @@ uninstall-local:
        -rm -f $(DESTDIR)$(mandir)/man5/abookrc.5
 
 
-SUBDIRS = intl po
+SUBDIRS = po
 
 ACLOCAL_AMFLAGS = -I m4