← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to libdevice/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdevice/Makefile.am
1
1
# 
2
 
#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
2
#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 
3
#   Free Software Foundation, Inc.
3
4
#
4
5
#   This program is free software; you can redistribute it and/or modify
5
6
#   it under the terms of the GNU General Public License as published by
53
54
        $(CAIRO_CFLAGS) \
54
55
        $(NULL)
55
56
 
56
 
GNASH_LIBS = \
57
 
        $(top_builddir)/libmedia/libgnashmedia.la \
58
 
        $(top_builddir)/libbase/libgnashbase.la \
59
 
        $(NULL)
60
 
 
61
57
instdir = $(includedir)/gnash
62
58
 
63
59
noinst_HEADERS = \
79
75
libgnashdevice_la_LDFLAGS =  -release $(VERSION) 
80
76
libgnashdevice_la_SOURCES = \
81
77
        GnashDevice.h \
82
 
        DeviceGlue.h
 
78
        DeviceGlue.h \
 
79
        DeviceGlue.cpp \
 
80
        $(NULL)       
83
81
 
84
82
if BUILD_X11_DEVICE
85
83
libgnashdevice_la_CPPFLAGS += $(X11_CFLAGS)
123
121
include directfb/directfb.am
124
122
endif
125
123
 
 
124
if ENABLE_DEVELOPER_TESTS
126
125
if BUILD_X11_DEVICE
 
126
 
127
127
check_PROGRAMS += test_x11
128
128
test_x11_SOURCES = x11/test_x11.cpp
129
129
test_x11_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
132
132
        $(X11_LIBS) \
133
133
        $(GNASH_LIBS)
134
134
endif
 
135
endif
135
136
 
136
137
if BUILD_VAAPI_DEVICE
137
138
include vaapi/vaapi.am