← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/src/client/dbus/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/client/dbus/Makefile.am
1
1
include $(top_srcdir)/globals.mak
2
2
 
3
 
noinst_LTLIBRARIES = libclient.la
 
3
noinst_LTLIBRARIES = libclient_dbus.la
4
4
 
5
5
BUILT_SOURCES=                      \
6
6
    callmanager-glue.h              \
14
14
endif
15
15
 
16
16
if SFL_VIDEO
17
 
BUILT_SOURCES+=video_controls-glue.h
18
 
video_controls-glue.h: video_controls-introspec.xml Makefile.am
 
17
BUILT_SOURCES+=videomanager-glue.h
 
18
videomanager-glue.h: videomanager-introspec.xml Makefile.am
19
19
        dbusxx-xml2cpp $< --adaptor=$@
20
20
endif
21
21
 
31
31
instance-glue.h: instance-introspec.xml Makefile.am
32
32
        dbusxx-xml2cpp $< --adaptor=$@
33
33
 
34
 
libclient_la_SOURCES = \
 
34
libclient_dbus_la_SOURCES = \
35
35
    callmanager_dbus.cpp \
36
 
    ../callmanager.cpp \
37
36
    configurationmanager_dbus.cpp  \
38
 
    ../configurationmanager.cpp  \
39
37
    instance.cpp  \
40
38
    client.cpp
41
39
 
42
40
if SFL_PRESENCE
43
 
libclient_la_SOURCES+=../presencemanager.cpp presencemanager_dbus.cpp
 
41
libclient_dbus_la_SOURCES += presencemanager_dbus.cpp
44
42
endif
45
43
 
46
44
if SFL_VIDEO
47
 
libclient_la_SOURCES+=video_controls.cpp
 
45
libclient_dbus_la_SOURCES += videomanager_dbus.cpp
48
46
endif
49
47
 
50
48
if USE_NETWORKMANAGER
51
 
libclient_la_SOURCES += networkmanager.cpp
 
49
libclient_dbus_la_SOURCES += networkmanager.cpp
52
50
NETWORKMANAGER=-DUSE_NETWORKMANAGER
53
 
else
54
 
NETWORKMANAGER=
55
51
endif
56
52
 
57
 
libclient_la_CXXFLAGS = -I../ \
 
53
libclient_dbus_la_CXXFLAGS = -I../ \
58
54
            -DPREFIX=\"$(prefix)\" \
59
55
            -DPROGSHAREDIR=\"${datadir}/sflphone\" \
60
56
            $(NETWORKMANAGER) \
61
57
            $(DBUSCPP_CFLAGS)
62
58
 
63
59
noinst_HEADERS =            \
64
 
    ../callmanager.h        \
65
 
    ../configurationmanager.h  \
66
60
    instance.h              \
67
 
    ../client.h             \
68
61
    networkmanager_proxy.h  \
69
62
    networkmanager.h        \
70
63
    dbus_cpp.h                  \
71
64
    $(BUILT_SOURCES)
72
65
 
73
 
if SFL_PRESENCE
74
 
noinst_HEADERS+=../presencemanager.h
75
 
endif
76
 
 
77
 
if SFL_VIDEO
78
 
noinst_HEADERS+=../video_controls.h
79
 
endif
80
 
 
81
66
# Dbus service file
82
67
servicedir = $(datadir)/dbus-1/services
83
68
service_in_files = org.sflphone.SFLphone.service.in
98
83
endif
99
84
 
100
85
if SFL_VIDEO
101
 
EXTRA_DIST += video_controls-introspec.xml
 
86
EXTRA_DIST += videomanager-introspec.xml
102
87
endif
103
88
 
104
89
CLEANFILES= \