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
419cb97b
Commit
419cb97b
authored
11 years ago
by
Vittorio Giovara
Committed by
Tristan Matthews
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
client: split the dbus Makefile into generic parts
Change-Id: Ic5ffa4329bb86e1a2208ab0e7e9d842e5d591c47 Refs: #46447
parent
fd2dffb0
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
daemon/src/Makefile.am
+1
-1
1 addition, 1 deletion
daemon/src/Makefile.am
daemon/src/client/Makefile.am
+27
-0
27 additions, 0 deletions
daemon/src/client/Makefile.am
daemon/src/client/dbus/Makefile.am
+6
-19
6 additions, 19 deletions
daemon/src/client/dbus/Makefile.am
with
34 additions
and
20 deletions
daemon/src/Makefile.am
+
1
−
1
View file @
419cb97b
...
@@ -41,7 +41,7 @@ libsflphone_la_LIBADD = \
...
@@ -41,7 +41,7 @@ libsflphone_la_LIBADD = \
$(
IAX_LIB
)
\
$(
IAX_LIB
)
\
./sip/libsiplink.la
\
./sip/libsiplink.la
\
./audio/libaudio.la
\
./audio/libaudio.la
\
./client/
dbus/
libclient.la
\
./client/libclient.la
\
./config/libconfig.la
\
./config/libconfig.la
\
./hooks/libhooks.la
\
./hooks/libhooks.la
\
./history/libhistory.la
$(
SFL_VIDEO_LIB
)
$(
IM_LIB
)
./history/libhistory.la
$(
SFL_VIDEO_LIB
)
$(
IM_LIB
)
...
...
This diff is collapsed.
Click to expand it.
daemon/src/client/Makefile.am
+
27
−
0
View file @
419cb97b
include
$(top_srcdir)/globals.mak
noinst_LTLIBRARIES
=
libclient.la
noinst_HEADERS
=
callmanager.h
\
configurationmanager.h
\
client.h
if
SFL_PRESENCE
PRESENCE_SRC
=
presencemanager.cpp
noinst_HEADERS
+=
presencemanager.h
endif
if
SFL_VIDEO
noinst_HEADERS
+=
video_controls.h
endif
SUBDIRS
=
dbus
SUBDIRS
=
dbus
libclient_la_LIBADD
=
dbus/libclient_dbus.la
libclient_la_SOURCES
=
callmanager.cpp
\
configurationmanager.cpp
\
$(
PRESENCE_SRC
)
libclient_la_CXXFLAGS
=
-I
./
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DPROGSHAREDIR
=
\"
${
datadir
}
/sflphone
\"
This diff is collapsed.
Click to expand it.
daemon/src/client/dbus/Makefile.am
+
6
−
19
View file @
419cb97b
include
$(top_srcdir)/globals.mak
include
$(top_srcdir)/globals.mak
noinst_LTLIBRARIES
=
libclient.la
noinst_LTLIBRARIES
=
libclient
_dbus
.la
BUILT_SOURCES
=
\
BUILT_SOURCES
=
\
callmanager-glue.h
\
callmanager-glue.h
\
...
@@ -31,51 +31,38 @@ configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
...
@@ -31,51 +31,38 @@ configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
instance-glue.h
:
instance-introspec.xml Makefile.am
instance-glue.h
:
instance-introspec.xml Makefile.am
dbusxx-xml2cpp
$<
--adaptor
=
$@
dbusxx-xml2cpp
$<
--adaptor
=
$@
libclient_la_SOURCES
=
\
libclient_
dbus_
la_SOURCES
=
\
callmanager_dbus.cpp
\
callmanager_dbus.cpp
\
../callmanager.cpp
\
configurationmanager_dbus.cpp
\
configurationmanager_dbus.cpp
\
../configurationmanager.cpp
\
instance.cpp
\
instance.cpp
\
client.cpp
client.cpp
if
SFL_PRESENCE
if
SFL_PRESENCE
libclient_la_SOURCES
+=
../presencemanager.cpp
presencemanager_dbus.cpp
libclient_
dbus_
la_SOURCES
+=
presencemanager_dbus.cpp
endif
endif
if
SFL_VIDEO
if
SFL_VIDEO
libclient_la_SOURCES
+=
video_controls.cpp
libclient_
dbus_
la_SOURCES
+=
video_controls.cpp
endif
endif
if
USE_NETWORKMANAGER
if
USE_NETWORKMANAGER
libclient_la_SOURCES
+=
networkmanager.cpp
libclient_
dbus_
la_SOURCES
+=
networkmanager.cpp
NETWORKMANAGER
=
-DUSE_NETWORKMANAGER
NETWORKMANAGER
=
-DUSE_NETWORKMANAGER
endif
endif
libclient_la_CXXFLAGS
=
-I
../
\
libclient_
dbus_
la_CXXFLAGS
=
-I
../
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DPROGSHAREDIR
=
\"
${
datadir
}
/sflphone
\"
\
-DPROGSHAREDIR
=
\"
${
datadir
}
/sflphone
\"
\
$(
NETWORKMANAGER
)
\
$(
NETWORKMANAGER
)
\
$(
DBUSCPP_CFLAGS
)
$(
DBUSCPP_CFLAGS
)
noinst_HEADERS
=
\
noinst_HEADERS
=
\
../callmanager.h
\
../configurationmanager.h
\
instance.h
\
instance.h
\
../client.h
\
networkmanager_proxy.h
\
networkmanager_proxy.h
\
networkmanager.h
\
networkmanager.h
\
dbus_cpp.h
\
dbus_cpp.h
\
$(
BUILT_SOURCES
)
$(
BUILT_SOURCES
)
if
SFL_PRESENCE
noinst_HEADERS
+=
../presencemanager.h
endif
if
SFL_VIDEO
noinst_HEADERS
+=
../video_controls.h
endif
# Dbus service file
# Dbus service file
servicedir
=
$(
datadir
)
/dbus-1/services
servicedir
=
$(
datadir
)
/dbus-1/services
service_in_files
=
org.sflphone.SFLphone.service.in
service_in_files
=
org.sflphone.SFLphone.service.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