← Back to branch summary

~ubuntu-branches/ubuntu/trusty/sflphone/trusty

« back to all changes in this revision

Viewing changes to daemon/src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (4.3.4 sid)
  • Revision ID: package-import@ubuntu.com-20140128182336-jrsv0k9u6cawc068
Tags: 1.3.0-1
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/Makefile.am
24
24
NETWORKMANAGER=-DUSE_NETWORKMANAGER
25
25
endif
26
26
 
27
 
SUBDIRS = dbus audio config hooks history sip $(IAX_SUBDIR) $(INSTANT_MESSAGING_SUBDIR) $(SFL_VIDEO_SUBDIR)
 
27
SUBDIRS = client audio config hooks history sip $(IAX_SUBDIR) $(INSTANT_MESSAGING_SUBDIR) $(SFL_VIDEO_SUBDIR)
28
28
 
29
29
sflphoned_SOURCES = main.cpp
30
30
 
41
41
        $(IAX_LIB) \
42
42
        ./sip/libsiplink.la \
43
43
        ./audio/libaudio.la \
44
 
        ./dbus/libdbus.la \
 
44
        ./client/dbus/libclient.la \
45
45
        ./config/libconfig.la \
46
46
        ./hooks/libhooks.la \
47
47
        ./history/libhistory.la $(SFL_VIDEO_LIB) $(IM_LIB)
55
55
                @ALSA_LIBS@ \
56
56
                @PULSEAUDIO_LIBS@ \
57
57
                @SAMPLERATE_LIBS@ \
 
58
                @SNDFILE_LIBS@ \
58
59
                @libssl_LIBS@ \
59
60
                @UUID_LIBS@ \
60
61
                @DBUSCPP_LIBS@
69
70
                @PULSEAUDIO_CFLAGS@ \
70
71
                @SAMPLERATE_CFLAGS@ \
71
72
                @libssl_CFLAGS@ \
72
 
                @UUID_CFLAGS@
 
73
                @UUID_CFLAGS@ \
 
74
                @DBUSCPP_CFLAGS@
73
75
 
74
76
libsflphone_la_SOURCES = conference.cpp \
75
77
                voiplink.cpp \
76
78
                preferences.cpp \
77
79
                managerimpl.cpp \
78
80
                manager.cpp \
79
 
                managerimpl_registration.cpp \
80
81
                eventthread.cpp \
81
82
                call.cpp \
82
83
                account.cpp \
83
84
                logger.cpp \
84
85
                numbercleaner.cpp \
85
86
                fileutils.cpp \
86
 
                scoped_lock.cpp \
87
 
                scoped_lock.h \
 
87
                sflthread.cpp \
 
88
                sflthread.h \
88
89
                conference.h \
89
90
                voiplink.h \
90
91
                preferences.h \
98
99
                numbercleaner.h \
99
100
                fileutils.h \
100
101
                noncopyable.h \
101
 
                cc_config.h \
102
102
                sfl_types.h \
103
103
                array_size.h \
104
104
                account_schema.h \