← Back to branch summary

~ubuntu-branches/ubuntu/precise/cheese/precise-proposed

« back to all changes in this revision

Viewing changes to tests/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Jeremy Bicha, Robert Ancell
  • Date: 2011-06-10 11:45:37 UTC
  • mfrom: (1.2.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20110610114537-p9e4zl8m0ehf2b5a
Tags: 3.0.0-0ubuntu1
* Upload to oneiric

[ Jeremy Bicha ]
* Depend on gnome-video-effects since clicking Effects when it is
  not installed results in a segmentation fault.

[ Robert Ancell]
* New upstream version
* debian/control:
  - Use standards version 3.9.1
  - Add build-depends on dh-autoreconf, valac, libclutter-1.0-dev,
    libclutter-gtk-1.0-dev, libclutter-gst-dev, libmx-dev,
    gnome-video-effects-dev, libgee-dev, gnome-common, gobject-introspection, 
    libgirepository1.0-dev, gir1.2-freedesktop, gir1.2-glib-2.0, 
    gir1.2-gstreamer-0.10, gir1.2-clutter-1.0, gir1.2-gdkpixbuf-2.0
  - Drop build-depends on libgconf2-dev, libdbus-1-dev, libdbus-glib-1-dev,
  - Bump build-depends on libglib2.0-dev, libgtk-3-dev,
    libgnome-desktop-3-dev, libgstreamer0.10-dev,
    libgstreamer-plugins-base0.10-dev, libcairo2-dev, libpango1.0-dev,
    librsvg2-dev, libcanberra-gtk3-dev
  - Add new gir1.2-cheese-3.0 package
  - libcheese-gtk18 -> libcheese-gtk19
* debian/cheese.install:
* debian/cheese-common.install:
* debian/libcheese-gtk-dev.install
  - Update for new/changed files
* debian/gir1.2-cheese-3.0.install:
  - Install typelib
* debian/patches/fix-linking.patch:
  - Fix linking issues
* debian/patches/no-gnu-gettext.patch:
  - Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/Makefile.am
1
 
INCLUDES = \
 
1
AM_CPPFLAGS = \
2
2
        -DBINDIR=\"$(bindir)\" \
3
3
        -DDATADIR=\"$(datadir)\" \
4
4
        -DPREFIX=\""$(prefix)"\" \
9
9
        -DAPPNAME_DATA_DIR=\"$(pkgdatadir)\" \
10
10
        -DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
11
11
        $(CHEESE_CFLAGS) \
 
12
        $(CHEESE_GTK_CFLAGS) \
12
13
        -I@top_srcdir@/libcheese \
13
14
        $(NULL)
14
15
 
15
 
EXAMPLES = cheese-test-widget cheese-test-monitor cheese-test-chooser
 
16
EXAMPLES = cheese-test-widget cheese-test-camera cheese-test-monitor cheese-test-chooser cheese-test-flash
16
17
 
17
18
if HAVE_XTEST
18
19
noinst_PROGRAMS = $(EXAMPLES) test-webcam-button
21
22
endif
22
23
 
23
24
cheese_test_widget_SOURCES = cheese-test-widget.c
 
25
cheese_test_camera_SOURCES = cheese-test-camera.c
24
26
cheese_test_monitor_SOURCES = cheese-test-monitor.c
25
27
test_webcam_button_SOURCES = test-webcam-button.c
 
28
cheese_test_flash_SOURCES = cheese-test-flash.c
 
29
cheese_test_chooser_SOURCES = cheese-test-chooser.c
26
30
 
27
31
cheese_test_widget_LDADD = $(CHEESE_LIBS) \
28
 
        $(top_builddir)/libcheese/libcheesecommon.la \
 
32
        $(CHEESE_GTK_LIBS) \
 
33
        $(top_builddir)/libcheese/libcheese.la \
29
34
        $(top_builddir)/libcheese/libcheese-gtk.la \
30
35
        $(NULL)
 
36
cheese_test_camera_LDADD = $(CHEESE_LIBS) \
 
37
        $(CHEESE_GTK_LIBS) \
 
38
        $(top_builddir)/libcheese/libcheese.la \
 
39
        $(NULL)
31
40
cheese_test_monitor_LDADD = $(CHEESE_LIBS) \
32
 
        $(top_builddir)/libcheese/libcheesecommon.la \
 
41
        $(CHEESE_GTK_LIBS) \
 
42
        $(top_builddir)/libcheese/libcheese.la \
33
43
        $(top_builddir)/libcheese/libcheese-gtk.la \
34
44
        $(NULL)
35
45
test_webcam_button_LDADD = $(XTEST_LIBS)
36
 
cheese_test_chooser_SOURCES = cheese-test-chooser.c
37
46
cheese_test_chooser_LDADD = $(CHEESE_LIBS) \
38
 
        $(top_builddir)/libcheese/libcheesecommon.la \
 
47
        $(CHEESE_GTK_LIBS) \
 
48
        $(top_builddir)/libcheese/libcheese.la \
 
49
        $(top_builddir)/libcheese/libcheese-gtk.la \
 
50
        $(NULL)
 
51
cheese_test_flash_LDADD = $(CHEESE_LIBS) \
 
52
        $(CHEESE_GTK_LIBS) \
 
53
        $(top_builddir)/libcheese/libcheese.la \
39
54
        $(top_builddir)/libcheese/libcheese-gtk.la \
40
55
        $(NULL)