← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gxine/utopic-proposed

« back to all changes in this revision

Viewing changes to browser-plugin/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2014-05-07 21:34:55 UTC
  • mfrom: (2.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20140507213455-qnu5diwyyj8bkaap
Tags: 0.5.907-3ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/rules, debian/control: use dh-autoreconf at build time.
  - debian/control: Add Xb-Npp-xxx, Xb-Npp-Description and Xb-Npp-File
    fields.
  - src/script_engine.c: fix a remaining memory leak issue associated with
    using JS_EncodeString(), which somehow didn't get fixed upstream
  - debian/gxineplugin.links: Add a link to xulrunner-addons/plugins
    directory.
  - mime.default: Add dvd, vcd, svcd tags.
* Dropped changes, no longer needed:
  - debian/gxine.install: no need to diverge from Debian since we no longer
    ship a wrapper
* All other changes dropped, as they have been included upstream or in
  Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
browser-plugin/Makefile.am
2
2
## Process this file with automake to produce Makefile.in
3
3
##
4
4
 
 
5
include $(top_srcdir)/misc/Makefile.quiet
 
6
 
5
7
plugin_source = plugin.c npunix.c
6
8
plugin_headers = jri.h \
7
9
                 jri_md.h \
24
26
gxineplugin_la_LDFLAGS = -avoid-version -module
25
27
gxineplugin_la_LIBADD  = -lm $(X_LIBS) $(X_EXTRA_LIBS) -lX11 -lXt -lXaw $(DYNAMIC_LD_LIBS)
26
28
 
 
29
else
 
30
EXTRA_DIST = $(plugin_headers) $(plugin_source)
 
31
endif
 
32
 
27
33
debug: CFLAGS=$(DEBUG_CFLAGS)
28
34
debug: all
29
35
 
30
36
install-debug: debug
31
37
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
32
38
 
33
 
else
34
 
EXTRA_DIST = $(plugin_headers) $(plugin_source)
35
 
endif