← Back to branch summary

~ubuntu-branches/ubuntu/saucy/empathy/saucy-updates

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-05-31 10:44:31 UTC
  • mfrom: (1.1.111) (6.6.55 experimental)
  • Revision ID: package-import@ubuntu.com-20130531104431-w0ec8ntcojx76y61
Tags: 3.8.3-0ubuntu1
* Merge with Debian, remaining changes:
  - debian/patches/00_linker-fixes.patch
  - debian/patches/10_use_notify_osd_icons.patch
  - debian/patches/23_idomessagedialog_for_voip_and_ft.patch
  - debian/patches/34_start_raised_execpt_in_session.patch
  - debian/patches/38_default_to_facebook_for_im.patch
  - debian/patches/39_default_to_freenode_for_irc.patch
  - debian/patches/41_unity_launcher_progress.patch
  - debian/patches/42_shell_running.patch
  - debian/patches/43_quicklists.patch
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* packages.
  - Remove Universe Build-Deps for geocode and cheese and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
* New upstream release 3.8.3
* debian/patches/include-empathy-keyring.h: Add, fix implicit declaration of
  empathy_keyring_set_account_password_finish and co by including the right
  header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
15
15
        $(CPPFLAGS_COMMON)                              \
16
16
        $(UNITY_CFLAGS)                                 \
17
17
        $(LIBCHAMPLAIN_CFLAGS)                          \
 
18
        $(UOA_CFLAGS)                                   \
18
19
        $(NULL)
19
20
 
20
21
LDADD =                                                         \
25
26
        $(EMPATHY_LIBS)                                         \
26
27
        $(UNITY_LIBS)                                           \
27
28
        $(LIBCHAMPLAIN_LIBS)                                    \
 
29
        $(UOA_LIBS)                                             \
28
30
        $(NULL)
29
31
 
30
32
noinst_LTLIBRARIES = libempathy-accounts-common.la
92
94
        empathy-chat.c \
93
95
        $(NULL)
94
96
 
 
97
nodist_empathy_chat_SOURCES = \
 
98
        empathy-chat-resources.c \
 
99
        empathy-chat-resources.h \
 
100
        $(NULL)
 
101
 
95
102
empathy_call_SOURCES = \
96
103
       empathy-call.c \
97
104
       empathy-call-factory.c \
190
197
 
191
198
EXTRA_DIST =                    \
192
199
        $(autostart_DATA)       \
193
 
        $(ui_DATA)
 
200
        $(ui_DATA)              \
 
201
        empathy-chat.js         \
 
202
        empathy-chat.gresource.xml
194
203
 
195
204
dist_man_MANS =                 \
196
205
        empathy.1 \
197
206
        empathy-accounts.1
198
207
 
 
208
BUILT_SOURCES = \
 
209
        $(nodist_empathy_chat_SOURCES) \
 
210
        $(NULL)
 
211
 
 
212
CLEANFILES = $(BUILT_SOURCES)
 
213
 
 
214
empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
 
215
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
 
216
                --sourcedir=$(srcdir) \
 
217
                --generate-source \
 
218
                $<
 
219
 
 
220
empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
 
221
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
 
222
                --sourcedir=$(srcdir) \
 
223
                --generate-header \
 
224
                $<