From edeb4b98c5b0175100bb8319ca0bc939f677d360 Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Mon, 22 Aug 2011 16:57:50 -0400 Subject: [PATCH] * #6714: fixed make distcheck for sflphone-plugins --- plugins/VERSION | 1 - plugins/addressbook/evolution/Makefile.am | 6 ++++-- plugins/configure.ac | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 plugins/VERSION diff --git a/plugins/VERSION b/plugins/VERSION deleted file mode 100644 index 6d44d227c..000000000 --- a/plugins/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.9.14 diff --git a/plugins/addressbook/evolution/Makefile.am b/plugins/addressbook/evolution/Makefile.am index 74cd4a88f..555bc7611 100644 --- a/plugins/addressbook/evolution/Makefile.am +++ b/plugins/addressbook/evolution/Makefile.am @@ -2,7 +2,7 @@ include ../../globals.mak noinst_PROGRAMS = libevladdrbook.so -libevladdrbook_so_SOURCES = eds.c addressbook.c +libevladdrbook_so_SOURCES = eds.c eds.h addressbook.c addressbook.h libevladdrbook_so_LDFLAGS = --shared $(SFLGLIB_LDFLAGS) $(SFLGTK_LDFLAGS) $(LIBEDATASERVER_LDFLAGS) $(LIBEDATASERVERUI_LDFLAGS) $(LIBEBOOK_LDFLAGS) @@ -15,7 +15,9 @@ install-exec-local: install-libplugin_libevladdrbook_so uninstall-local: uninstall-libplugin_libevladdrbook_so install-libplugin_libevladdrbook_so: libevladdrbook.so - $(INSTALL_PROGRAM) libevladdrbook.so $(sflplugindir) + mkdir -p $(sflplugindir) + $(INSTALL_PROGRAM) libevladdrbook.so $(sflplugindir) uninstall-libplugin_libevladdrbook_so: rm -f $(sflplugindir)/libevladdrbook.so + rm -rf $(sflplugindir) diff --git a/plugins/configure.ac b/plugins/configure.ac index 7b21289b9..a99421423 100644 --- a/plugins/configure.ac +++ b/plugins/configure.ac @@ -1,10 +1,7 @@ -AC_INIT([SFLphone],[0.9.14],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins]) +AC_INIT([sflphone],[0.9.14],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins]) AC_CONFIG_HEADERS([config.h]) -PACKAGE=SFLphone -VERSION=`cat VERSION` - -AM_INIT_AUTOMAKE($PACKAGE,$VERSION) +AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([m4]) dnl Silent build by default. Use make V=1 to increase verbosity