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
7522c47d
Commit
7522c47d
authored
15 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
[#2181] Install libdbus-c++ in $pkglib instead of $lib
ie in /usr/lib/sflphone for instance, instead of /usr/lib
parent
ddc21f54
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
sflphone-common/configure.ac
+1
-1
1 addition, 1 deletion
sflphone-common/configure.ac
sflphone-common/globals.mak
+3
-2
3 additions, 2 deletions
sflphone-common/globals.mak
sflphone-common/libs/dbus-c++/src/Makefile.am
+2
-1
2 additions, 1 deletion
sflphone-common/libs/dbus-c++/src/Makefile.am
with
6 additions
and
4 deletions
sflphone-common/configure.ac
+
1
−
1
View file @
7522c47d
...
...
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([
SFL
phone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_INIT([
sfl
phone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$])
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/globals.mak
+
3
−
2
View file @
7522c47d
# Global variables
src
=
$(
top_srcdir
)
sflcodecdir
=
$(
DESTDIR
)$(
libdir
)
/sflphone/codecs
sflplugindir
=
$(
DESTDIR
)$(
libdir
)
/sflphone/plugins
sfllibdir
=
$(
DESTDIR
)$(
libdir
)
/sflphone
sflcodecdir
=
$(
sfllibdir
)
/codecs
sflplugindir
=
$(
sfllibdir
)
/plugins
ASTYLERC
=
"../astylerc"
indent
=
"/usr/bin/astyle"
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/libs/dbus-c++/src/Makefile.am
+
2
−
1
View file @
7522c47d
...
...
@@ -37,9 +37,10 @@ HEADER_FILES = \
# noinst_lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
noinst_HEADERS
=
$(
HEADER_FILES
)
lib_LTLIBRARIES
=
libdbus-c++-1.la
pkg
lib_LTLIBRARIES
=
libdbus-c++-1.la
libdbus_c___1_la_SOURCES
=
$(
HEADER_FILES
)
interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp
$(
GLIB_CPP
)
$(
ECORE_CPP
)
libdbus_c___1_la_LIBADD
=
$(
dbus_LIBS
)
$(
glib_LIBS
)
$(
pthread_LIBS
)
MAINTAINERCLEANFILES
=
\
Makefile.in
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