jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #6714: fixed make distcheck for gnome client

Browse Source
This commit is contained in:
Tristan Matthews
2011-08-22 16:51:48 -04:00
parent d3a2c22f46
commit 4a7d62457d
12 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gnome/Makefile.am
View File

@ -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)

1
gnome/VERSION
View File

@ -1 +0,0 @@
0.9.14

7
gnome/configure.ac
View File

@ -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

2
gnome/po/Makefile.am
View File

@ -28,7 +28,7 @@ MOFILES=\
MSGFMT=msgfmt
# necessary files
EXTRA_DIST= $(POFILES)
EXTRA_DIST= $(POFILES) $(MOFILES)
all: $(MOFILES)

2
gnome/src/Makefile.am
View File

@ -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)

13
gnome/src/config/Makefile.am
View File

@ -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) \

2
gnome/src/config/assistant.c
View File

@ -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

11
gnome/src/contacts/Makefile.am
View File

@ -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)

10
gnome/src/contacts/calllist.c
View File

@ -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)

1
gnome/src/dbus/Makefile.am
View File

@ -22,6 +22,7 @@ marshaller.h: marshaller.list
libdbus_la_SOURCES= \
dbus.c \
dbus.h \
$(BUILT_SOURCES)
libdbus_la_LDFLAGS= $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \

9
gnome/src/icons/Makefile.am
View File

@ -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) \

5
gnome/src/widget/Makefile.am
View File

@ -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) \