From 4a7d62457db9066f53bf2a84ab781deb54d94b17 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 22 Aug 2011 16:51:48 -0400
Subject: [PATCH] * #6714: fixed make distcheck for gnome client
---
gnome/Makefile.am | 5 ++---
gnome/VERSION | 1 -
gnome/configure.ac | 7 ++-----
gnome/po/Makefile.am | 2 +-
gnome/src/Makefile.am | 2 +-
gnome/src/config/Makefile.am | 13 ++++++++++++-
gnome/src/config/assistant.c | 2 +-
gnome/src/contacts/Makefile.am | 11 +++++++++--
gnome/src/contacts/calllist.c | 10 +++++-----
gnome/src/dbus/Makefile.am | 1 +
gnome/src/icons/Makefile.am | 9 +++------
gnome/src/widget/Makefile.am | 5 ++++-
12 files changed, 41 insertions(+), 27 deletions(-)
delete mode 100644 gnome/VERSION
diff --git a/gnome/Makefile.am b/gnome/Makefile.am
index e738c4d160..a80580d35c 100644
--- a/gnome/Makefile.am
+++ b/gnome/Makefile.am
@@ -14,13 +14,12 @@ ui_DATA=src/ui.xml
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = sflphone-client-gnome.schemas
-EXTRA_DIST = sflphone.desktop.in $(GNOME_DOC) m4 $(UI_DATA) $(schema_DATA)
+EXTRA_DIST = sflphone.desktop.in $(GNOME_DOC) m4 $(ui_DATA) $(schema_DATA) $(apps_DATA)
appsdir = $(datadir)/applications
apps_in_files = sflphone.desktop.in
apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-#@INTLTOOL_DESKTOP_RULE@
DISTCLEANFILES= sflphone.desktop $(GNOME_DOC)
install-data-local:
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$(schema_DATA)
diff --git a/gnome/VERSION b/gnome/VERSION
deleted file mode 100644
index 6d44d227cf..0000000000
--- a/gnome/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.9.14
diff --git a/gnome/configure.ac b/gnome/configure.ac
index 1e94d1923e..2fcd47a988 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,12 +1,9 @@
-AC_INIT([SFLphone],[0.9.14],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[0.9.14],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE
GNOME_DOC_INIT
-PACKAGE=SFLphone
-VERSION=`cat VERSION`
-
-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AC_CONFIG_MACRO_DIR([m4])
dnl Silent build by default. Use make V=1 to increase verbosity
diff --git a/gnome/po/Makefile.am b/gnome/po/Makefile.am
index 2f8eebd1cc..d8fbc8b2ba 100644
--- a/gnome/po/Makefile.am
+++ b/gnome/po/Makefile.am
@@ -28,7 +28,7 @@ MOFILES=\
MSGFMT=msgfmt
# necessary files
-EXTRA_DIST= $(POFILES)
+EXTRA_DIST= $(POFILES) $(MOFILES)
all: $(MOFILES)
diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am
index 51eb9d8f65..ce9b682717 100644
--- a/gnome/src/Makefile.am
+++ b/gnome/src/Makefile.am
@@ -33,7 +33,7 @@ sflphone_client_gnome_SOURCES = \
noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
reqaccount.h errors.h sflphone_const.h uimanager.h \
accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
- shortcuts.h eel-gconf-extensions.h logger.h
+ shortcuts.h eel-gconf-extensions.h logger.h imwindow.h
sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(LIBSEXY_LIBS) $(X11_LIBS) \
$(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LIBGNOMEUI_LIBS) $(GNOMEDOCUTILS_LIBS) $(LD_LIBS)
diff --git a/gnome/src/config/Makefile.am b/gnome/src/config/Makefile.am
index f015079850..ff021a34af 100644
--- a/gnome/src/config/Makefile.am
+++ b/gnome/src/config/Makefile.am
@@ -13,7 +13,18 @@ libconfig_la_SOURCES = \
accountconfigdialog.c \
hooks-config.c \
audioconf.c \
- utils.c
+ utils.c \
+ accountconfigdialog.h \
+ accountlistconfigdialog.h \
+ addressbook-config.h \
+ assistant.h \
+ audioconf.h \
+ hooks-config.h \
+ preferencesdialog.h \
+ shortcuts-config.h \
+ tlsadvanceddialog.h \
+ utils.h \
+ zrtpadvanceddialog.h
libconfig_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
$(SFLGTK_LDFLAGS) $(SFLGLIB_LDFLAGS) $(WEBKIT_LDFLAGS) $(LIBGNOMEUI_LDFLAGS) \
diff --git a/gnome/src/config/assistant.c b/gnome/src/config/assistant.c
index 5b9d05665c..845a0dbe93 100644
--- a/gnome/src/config/assistant.c
+++ b/gnome/src/config/assistant.c
@@ -30,7 +30,7 @@
#include <string.h>
-#include <assistant.h>
+#include "assistant.h"
#include "reqaccount.h"
// From version 2.16, gtk provides the functionalities libsexy used to provide
diff --git a/gnome/src/contacts/Makefile.am b/gnome/src/contacts/Makefile.am
index cbaf218b5e..aa4ea9ba6d 100644
--- a/gnome/src/contacts/Makefile.am
+++ b/gnome/src/contacts/Makefile.am
@@ -9,7 +9,15 @@ libcontacts_la_SOURCES = \
calltree.c \
history.c \
addrbookfactory.c \
- conferencelist.c
+ conferencelist.c \
+ addrbookfactory.h \
+ addressbook.h \
+ calllist.h \
+ calltab.h \
+ calltree.h \
+ conferencelist.h \
+ history.h \
+ searchbar.h
libcontacts_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
$(SFLGTK_LDFLAGS) $(SFLGLIB_LDFLAGS) $(WEBKIT_LDFLAGS) $(LIBGNOMEUI_LDFLAGS) \
@@ -18,4 +26,3 @@ libcontacts_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
libcontacts_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
$(SFLGTK_CFLAGS) $(SFLGLIB_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGNOMEUI_CFLAGS) \
$(GNOMEDOCUTILS_CFLAGS)
-
diff --git a/gnome/src/contacts/calllist.c b/gnome/src/contacts/calllist.c
index 7ab2c56cf0..74d93caeae 100644
--- a/gnome/src/contacts/calllist.c
+++ b/gnome/src/contacts/calllist.c
@@ -28,10 +28,10 @@
* as that of the covered work.
*/
-#include <calllist.h>
-#include <calltree.h>
-#include <contacts/searchbar.h>
-#include <eel-gconf-extensions.h>
+#include "calllist.h"
+#include "calltree.h"
+#include "contacts/searchbar.h"
+#include "eel-gconf-extensions.h"
static
gint is_callID_callstruct(gconstpointer a, gconstpointer b)
@@ -106,7 +106,7 @@ calllist_init (calltab_t* tab)
* Function passed to calllist_clean to free every QueueElement.
*/
static void
-calllist_free_element(gpointer data, gpointer user_data)
+calllist_free_element(gpointer data, gpointer user_data UNUSED)
{
QueueElement *element = data;
if (element->type == HIST_CONFERENCE)
diff --git a/gnome/src/dbus/Makefile.am b/gnome/src/dbus/Makefile.am
index 8f4fd290da..4970f2b0b9 100644
--- a/gnome/src/dbus/Makefile.am
+++ b/gnome/src/dbus/Makefile.am
@@ -22,6 +22,7 @@ marshaller.h: marshaller.list
libdbus_la_SOURCES= \
dbus.c \
+ dbus.h \
$(BUILT_SOURCES)
libdbus_la_LDFLAGS= $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
diff --git a/gnome/src/icons/Makefile.am b/gnome/src/icons/Makefile.am
index d639fb7506..8a3d68879b 100644
--- a/gnome/src/icons/Makefile.am
+++ b/gnome/src/icons/Makefile.am
@@ -2,12 +2,9 @@ include ../../globals.mak
noinst_LTLIBRARIES = libicons.la
-libicons_la_SOURCES = \
- icon_factory.c
-
-noinst_libicons_la_HEADER= \
- icon_factory.h \
- pixmaps_data.h
+libicons_la_SOURCES = icon_factory.c \
+ icon_factory.h \
+ pixmap_data.h
libicons_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
$(SFLGTK_LDFLAGS) $(SFLGLIB_LDFLAGS) $(WEBKIT_LDFLAGS) $(LIBGNOMEUI_LDFLAGS) \
diff --git a/gnome/src/widget/Makefile.am b/gnome/src/widget/Makefile.am
index ebc7eaa85f..32a368d363 100644
--- a/gnome/src/widget/Makefile.am
+++ b/gnome/src/widget/Makefile.am
@@ -4,8 +4,11 @@ noinst_LTLIBRARIES = libwidget.la
libwidget_la_SOURCES = \
gtkscrollbook.c \
+ gtkscrollbook.h \
+ minidialog.h \
minidialog.c \
- imwidget.c
+ imwidget.c \
+ imwidget.h
libwidget_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
$(SFLGTK_LDFLAGS) $(SFLGLIB_LDFLAGS) $(WEBKIT_LDFLAGS) $(LIBGNOMEUI_LDFLAGS) \
--
GitLab