← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnash/vivid-proposed

« back to all changes in this revision

Viewing changes to utilities/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Gabriele Giacone
  • Date: 2013-09-03 18:24:18 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20130903182418-kmdhv8e7s7dvib9a
Tags: 0.8.11~git20130903-1
http://bugs.debian.org/715067
* Git snapshot.
  + Embedded jemalloc copy has been replaced by system one.
    - Add libjemalloc-dev to B-D.
    - Disable jemalloc on hurd and kfreebsd-*. No longer disabled upstream.
  + ffmpeg/libav internal resampler replaced with external resampling library.
    - Add libavresample-dev to B-D.
* Add gnash-cygnal to gnash-dev runtime deps (Closes: #715067)
* Switch to dh compatibility 9.
  + Remove hardening-wrapper from B-D.
* Make Vcs-* fields canonical.
* Bump Standards-Version to 3.9.4 (no changes).
* Remove DMUA flag.

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/Makefile.am
27
27
GNASH_LIBS = \
28
28
        $(top_builddir)/libcore/libgnashcore.la \
29
29
        $(top_builddir)/libbase/libgnashbase.la \
30
 
        $(top_builddir)/libmedia/libgnashmedia.la \
31
 
        $(top_builddir)/libsound/libgnashsound.la \
32
30
        $(top_builddir)/librender/libgnashrender.la \
33
31
        $(NULL)
34
32
 
 
33
if BUILD_LIBMEDIA
 
34
GNASH_LIBS += $(top_builddir)/libmedia/libgnashmedia.la
 
35
endif
 
36
if BUILD_LIBSOUND
 
37
GNASH_LIBS += $(top_builddir)/libsound/libgnashsound.la
 
38
endif
 
39
 
 
40
AM_CXXFLAGS = $(CROSS_CXXFLAGS)
 
41
 
35
42
AM_LDFLAGS = \
36
43
        $(LIBINTL) \
37
44
        $(LIBADD_DL) \
38
45
        $(PTHREAD_LIBS) \
 
46
        $(BOOST_LIBS) \
39
47
        $(GNASH_LIBS) \
40
48
        $(NULL)
41
49
 
 
50
if ANDROID
 
51
AM_LDFLAGS +=  -lui -llog
 
52
endif   # ANDROID
 
53
 
42
54
localedir = $(datadir)/locale
43
55
 
44
56
AM_CPPFLAGS = \
61
73
        $(GLIB_CFLAGS) \
62
74
        $(BOOST_CFLAGS) \
63
75
        $(PTHREAD_CFLAGS) \
64
 
        -fPIC \
65
76
        $(NULL)
66
77
 
67
78
if BUILD_EGL_DEVICE