← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
1
1
include $(top_srcdir)/tools/flymake.mk
2
2
 
3
3
CPPFLAGS_COMMON =                                       \
4
 
        $(YELL_CFLAGS)                                  \
5
4
        $(EMPATHY_CFLAGS)                               \
6
5
        $(EDS_CFLAGS)                                   \
7
 
        $(GTK_CFLAGS)                                   \
8
6
        $(ERROR_CFLAGS)                                 \
9
7
        -I$(top_srcdir)                                 \
10
8
        -DG_LOG_DOMAIN=\"empathy\"                      \
11
 
        -DDESKTOPDIR=\"$(datadir)/applications\"        \
12
9
        -DBIN_DIR=\"$(bindir)\"                         \
13
10
        $(DISABLE_DEPRECATED)                           \
14
11
        $(WARN_CFLAGS)                                  \
17
14
AM_LDFLAGS = -lm
18
15
AM_CPPFLAGS =                                           \
19
16
        $(CPPFLAGS_COMMON)                              \
20
 
        $(LIBNOTIFY_CFLAGS)                             \
21
 
        $(INDICATE_CFLAGS)                              \
22
17
        $(UNITY_CFLAGS)                                 \
23
 
        $(UNIQUE_CFLAGS) \
24
18
        $(LIBCHAMPLAIN_CFLAGS)                          \
25
19
        $(WEBKIT_CFLAGS)                                \
26
20
        $(NULL)
29
23
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
30
24
        $(top_builddir)/libempathy/libempathy.la                \
31
25
        $(top_builddir)/extensions/libemp-extensions.la         \
32
 
        $(LIBNOTIFY_LIBS)                                       \
33
 
        $(INDICATE_LIBS)                                        \
 
26
        $(GCR_LIBS)                                             \
 
27
        $(EMPATHY_LIBS)                                         \
34
28
        $(UNITY_LIBS)                                           \
35
 
        $(UNIQUE_LIBS)                                          \
36
 
        $(EMPATHY_LIBS)                                         \
37
 
        $(GTK_LIBS)                                             \
38
 
        $(YELL_LIBS)                                            \
39
29
        $(LIBCHAMPLAIN_LIBS)                                    \
40
30
        $(WEBKIT_LIBS)
41
31
 
55
45
libempathy_accounts_common_la_LIBADD =                                  \
56
46
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la                \
57
47
        $(EDS_LIBS)                                                     \
58
 
        $(LIBNOTIFY_LIBS)                                               \
59
 
        $(UNIQUE_LIBS) \
60
48
        $(EMPATHY_LIBS)                                                 \
61
49
        $(LIBCHAMPLAIN_LIBS)                                            \
62
50
        $(WEBKIT_LIBS)                                                  \
95
83
 
96
84
libexec_PROGRAMS = \
97
85
        empathy-auth-client \
98
 
        empathy-av
 
86
        empathy-av \
 
87
        empathy-chat
99
88
 
100
89
BUILT_SOURCES = \
101
90
        src-marshal.h \
130
119
        empathy-streamed-media-window-fullscreen.h \
131
120
        empathy-streamed-media-window.c \
132
121
        empathy-streamed-media-window.h \
133
 
        empathy-sidebar.c \
134
 
        empathy-sidebar.h \
135
122
        empathy-video-src.c \
136
123
        empathy-video-src.h \
137
124
        empathy-video-widget.c \
138
 
        empathy-video-widget.h
 
125
        empathy-video-widget.h \
 
126
        ev-sidebar.c \
 
127
        ev-sidebar.h \
 
128
        $(NULL)
139
129
 
140
130
nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
141
131
 
143
133
empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS)
144
134
 
145
135
empathy_auth_client_SOURCES =                                           \
146
 
        empathy-auth-client.c
147
 
 
148
 
if HAVE_CALL
149
 
 
150
 
libexec_PROGRAMS += empathy-call
151
 
 
152
 
empathy_call_SOURCES = \
153
 
       empathy-call.c \
154
 
       empathy-call-factory.c \
155
 
       empathy-call-factory.h \
156
 
       empathy-call-handler.c \
157
 
       empathy-call-handler.h \
158
 
       empathy-call-window.c \
159
 
       empathy-call-window.h \
160
 
       empathy-call-window-fullscreen.c \
161
 
       empathy-call-window-fullscreen.h \
162
 
       empathy-audio-sink.c \
163
 
       empathy-audio-sink.h \
164
 
       empathy-audio-src.c \
165
 
       empathy-audio-src.h \
166
 
       empathy-video-src.c \
167
 
       empathy-video-src.h \
168
 
       empathy-video-widget.c \
169
 
       empathy-video-widget.h \
170
 
       empathy-sidebar.c \
171
 
       empathy-sidebar.h
172
 
 
173
 
nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
174
 
 
175
 
empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
176
 
empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
177
 
 
178
 
endif
 
136
        empathy-auth-client.c \
 
137
        $(NULL)
 
138
 
 
139
empathy_chat_SOURCES =                                          \
 
140
        empathy-about-dialog.c empathy-about-dialog.h                   \
 
141
        empathy-chat-manager.c empathy-chat-manager.h           \
 
142
        empathy-chat-window.c empathy-chat-window.h             \
 
143
        empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
 
144
        empathy-chat.c \
 
145
        gedit-close-button.c gedit-close-button.h \
 
146
        $(NULL)
179
147
 
180
148
empathy_handwritten_source = \
181
149
        empathy-about-dialog.c empathy-about-dialog.h                   \
187
155
        empathy-main-window.c empathy-main-window.h                     \
188
156
        empathy-migrate-butterfly-logs.c empathy-migrate-butterfly-logs.h \
189
157
        empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h     \
 
158
        empathy-notifications-approver.c empathy-notifications-approver.h \
190
159
        empathy-call-observer.c empathy-call-observer.h                 \
191
160
        empathy-preferences.c empathy-preferences.h                     \
192
161
        empathy-status-icon.c empathy-status-icon.h                     \
193
162
        empathy-chat-manager.c empathy-chat-manager.h                   \
 
163
        gedit-close-button.c gedit-close-button.h \
194
164
        empathy.c
195
165
 
196
166
empathy_SOURCES =                                                       \
202
172
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la                \
203
173
        $(top_builddir)/libempathy/libempathy.la                        \
204
174
        $(top_builddir)/extensions/libemp-extensions.la                 \
205
 
        $(LIBNOTIFY_LIBS)                                               \
206
 
        $(UNIQUE_LIBS)                                          \
207
175
        $(EMPATHY_LIBS)                                                 \
208
 
        $(INDICATE_LIBS)                                                \
 
176
        $(LIBCHAMPLAIN_LIBS)                                            \
209
177
        $(UNITY_LIBS)                                                   \
210
 
        $(LIBCHAMPLAIN_LIBS)                                            \
211
178
        $(WEBKIT_LIBS)                                                  \
212
179
        $(NULL)
213
180
 
216
183
check_c_sources = \
217
184
    $(empathy_handwritten_source) \
218
185
    $(empathy_logs_SOURCES) \
219
 
    $(empathy_av_SOURCES)
 
186
    $(empathy_handwritten_av_source)
220
187
 
221
188
include $(top_srcdir)/tools/check-coding-style.mk
222
189
check-local: check-coding-style
239
206
        $(autostart_DATA)       \
240
207
        $(ui_DATA)
241
208
 
242
 
if HAVE_LIBINDICATE
243
 
empathy_handwritten_source +=                           \
244
 
        empathy-indicator-manager.c             \
245
 
        empathy-indicator-manager.h             \
246
 
        empathy-indicator.c empathy-indicator.h
247
 
else
248
 
EXTRA_DIST +=                                   \
249
 
        empathy-indicator-manager.c             \
250
 
        empathy-indicator-manager.h             \
251
 
        empathy-indicator.c empathy-indicator.h
252
 
endif
253
 
 
254
209
if HAVE_LIBCHAMPLAIN
255
210
empathy_handwritten_source +=                           \
256
211
        empathy-map-view.c                      \