Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
3fcb3feb
Commit
3fcb3feb
authored
10 years ago
by
Cyrille Béraud
Committed by
Adrien Béraud
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Migrate addressbook plugin to Ring
Change-Id: I333ad302cc5c9c230f60490074cb85d06952160b
parent
3ec50b81
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/configure.ac
+1
-1
1 addition, 1 deletion
plugins/configure.ac
plugins/globals.mak
+5
-5
5 additions, 5 deletions
plugins/globals.mak
with
6 additions
and
6 deletions
plugins/configure.ac
+
1
−
1
View file @
3fcb3feb
AC_INIT([
sflphone],[1.4.2
],[sflphoneteam@savoirfairelinux.com],[
sflphone
-plugins])
AC_INIT([
Ring],[2.0.0
],[sflphoneteam@savoirfairelinux.com],[
ring
-plugins])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_AUX_DIR([build-aux])
...
...
This diff is collapsed.
Click to expand it.
plugins/globals.mak
+
5
−
5
View file @
3fcb3feb
...
@@ -4,7 +4,7 @@ src = $(top_srcdir)
...
@@ -4,7 +4,7 @@ src = $(top_srcdir)
ASTYLERC
=
"
$(
top_srcdir
)
/../astylerc"
ASTYLERC
=
"
$(
top_srcdir
)
/../astylerc"
indent
=
"/usr/bin/astyle"
indent
=
"/usr/bin/astyle"
sfllibdir
=
$(
DESTDIR
)$(
libdir
)
/
sflphone
sfllibdir
=
$(
DESTDIR
)$(
libdir
)
/
ring
sflplugindir
=
$(
sfllibdir
)
/plugins
sflplugindir
=
$(
sfllibdir
)
/plugins
# Preprocessor flags
# Preprocessor flags
...
@@ -15,9 +15,9 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
...
@@ -15,9 +15,9 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
-I
$(
src
)
/src/dbus
\
-I
$(
src
)
/src/dbus
\
-I
$(
src
)
/src/contacts
\
-I
$(
src
)
/src/contacts
\
-I
$(
src
)
/src/addressbook
\
-I
$(
src
)
/src/addressbook
\
-DDATA_DIR
=
\"
"
$(
prefix
)
/share/
sflphone
"
\"
\
-DDATA_DIR
=
\"
"
$(
prefix
)
/share/
ring
"
\"
\
-DICONS_DIR
=
\"
"
$(
prefix
)
/share/
sflphone
"
\"
\
-DICONS_DIR
=
\"
"
$(
prefix
)
/share/
ring
"
\"
\
-DCODECS_DIR
=
\"
"
$(
prefix
)
/lib/
sflphone
/codecs"
\"
\
-DCODECS_DIR
=
\"
"
$(
prefix
)
/lib/
ring
/codecs"
\"
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DENABLE_TRACE
\
-DENABLE_TRACE
\
-DPREFIX
=
\"
"
$(
prefix
)
"
\"
\
-DPREFIX
=
\"
"
$(
prefix
)
"
\"
\
...
@@ -25,7 +25,7 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
...
@@ -25,7 +25,7 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \
-DDATADIR
=
\"
"
$(
datadir
)
"
\"
\
-DDATADIR
=
\"
"
$(
datadir
)
"
\"
\
-DLIBDIR
=
\"
"
$(
libdir
)
"
\"
\
-DLIBDIR
=
\"
"
$(
libdir
)
"
\"
\
-DLOCALEDIR
=
\"
"
$(
localedir
)
"
\"
\
-DLOCALEDIR
=
\"
"
$(
localedir
)
"
\"
\
-DSFLPHONE_UIDIR
=
\"
"
$(
datadir
)
/
sflphone
/ui"
\"
\
-DSFLPHONE_UIDIR
=
\"
"
$(
datadir
)
/
ring
/ui"
\"
\
-DPLUGINS_DIR
=
\"
"
$(
sflplugindir
)
"
\"
-DPLUGINS_DIR
=
\"
"
$(
sflplugindir
)
"
\"
indent
:
indent
:
@
echo
"Indenting code:"
@
echo
"Indenting code:"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment