← Back to branch summary

~ubuntu-branches/ubuntu/lucid/epiphany-browser/lucid

« back to all changes in this revision

Viewing changes to embed/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Gustavo Noronha Silva, Josselin Mouette
  • Date: 2009-11-13 19:28:48 UTC
  • mfrom: (1.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091113192848-l1ktaulwcdb1cd2i
Tags: 2.29.1-2
[ Gustavo Noronha Silva ]
* debian/patches/04_set_prgname.patch:
- New patch, to make sure GNOME Shell is able to match the application
  windows to the .desktop file, and app well favourite.

[ Josselin Mouette ]
* Add a conflict with swfdec-mozilla, the plugin makes the browser 
  completely unusable on any website with Flash content.

Show diffs side-by-side

added added

removed removed

Lines of Context:
embed/Makefile.in
38
38
subdir = embed
39
39
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
40
40
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41
 
am__aclocal_m4_deps = $(top_srcdir)/m4/dolt.m4 \
42
 
        $(top_srcdir)/m4/gnome-doc-utils.m4 \
 
41
am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
43
42
        $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
44
43
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
45
44
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
88
87
am__mv = mv -f
89
88
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
90
89
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
90
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 
91
        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 
92
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 
93
        $(AM_CFLAGS) $(CFLAGS)
91
94
AM_V_CC = $(am__v_CC_$(V))
92
95
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
93
96
am__v_CC_0 = @echo "  CC    " $@;
167
170
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
168
171
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
169
172
DOC_USER_FORMATS = @DOC_USER_FORMATS@
170
 
DOLT_BASH = @DOLT_BASH@
171
173
DSYMUTIL = @DSYMUTIL@
172
174
DUMPBIN = @DUMPBIN@
173
175
ECHO_C = @ECHO_C@
197
199
GTKDOC_CHECK = @GTKDOC_CHECK@
198
200
GTKDOC_MKPDF = @GTKDOC_MKPDF@
199
201
GTKDOC_REBASE = @GTKDOC_REBASE@
200
 
GTK_BUILDER_CONVERT = @GTK_BUILDER_CONVERT@
201
202
G_IR_COMPILER = @G_IR_COMPILER@
202
203
G_IR_GENERATE = @G_IR_GENERATE@
203
204
G_IR_SCANNER = @G_IR_SCANNER@
243
244
LIPO = @LIPO@
244
245
LN_S = @LN_S@
245
246
LSB_RELEASE = @LSB_RELEASE@
246
 
LTCOMPILE = @LTCOMPILE@
247
 
LTCXXCOMPILE = @LTCXXCOMPILE@
248
247
LTLIBOBJS = @LTLIBOBJS@
249
248
MAINT = @MAINT@
250
249
MAKEINFO = @MAKEINFO@