← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnote/vivid-proposed

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Vincent Cheng
  • Date: 2011-09-24 20:18:37 UTC
  • mfrom: (1.3.11 upstream)
  • Revision ID: package-import@ubuntu.com-20110924201837-39jpl1odhsub2956
Tags: 0.8.0-1
http://bugs.debian.org/638108
http://bugs.debian.org/566670
* New upstream release, featuring GTK+ 3 port.
  - Add versioned build dependency on libglibmm-2.4-dev (>= 2.28).
  - Replace build dependency on libgtkmm-2.4-dev with libgtkmm-3.0-dev.
  - Remove build dependencies on the following packages:
    - libdbus-c++-dev
    - libgconf2-dev
    - libgtkspell-dev (GtkSpell has yet to be ported to GTK+ 3)
    - libpanelappletmm-2.6-dev (Closes: #638108)
      - This removes support for the gnome-panel applet. (Closes: #566670)
      - Support for gnome-panel will be re-enabled once
        libpanel-applet-4-dev migrates from experimental to unstable.
* Re-format debian/copyright to fix lintian warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
6
6
 
7
7
INCLUDES = -I$(top_srcdir)
8
8
AM_CPPFLAGS=@LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
9
 
        @GCONF_CFLAGS@ @GTK_CFLAGS@ \
 
9
        @GTK_CFLAGS@ \
10
10
        @GTKSPELL_CFLAGS@ @LIBXML_CFLAGS@ \
11
11
        @LIBXSLT_CFLAGS@ \
12
12
        @PCRE_CFLAGS@ \
13
 
        @DBUS_CFLAGS@ \
 
13
        @UUID_CFLAGS@ \
14
14
        -DGNOTE_LOCALEDIR=\"@GNOTE_LOCALEDIR@\" \
15
15
        -DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
16
16
 
18
18
 
19
19
GNOTE_LIBS = libgnote.a $(top_builddir)/libtomboy/libtomboy.la \
20
20
        @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
21
 
        @GCONF_LIBS@ \
22
21
        @LIBXSLT_LIBS@ \
23
22
        @PCRE_LIBS@ \
24
 
        @DBUS_LIBS@ \
25
23
        @GTKSPELL_LIBS@ @GTK_LIBS@ \
26
 
        -luuid
 
24
        @UUID_LIBS@
27
25
 
28
26
noinst_LIBRARIES = libgnote.a
29
27
bin_PROGRAMS = gnote
68
66
gnote_SOURCES = main.cpp
69
67
 
70
68
 
71
 
if HAVE_PANELAPPLETMM
 
69
if HAVE_PANELAPPLET
72
70
APPLET_SOURCES=applet.hpp applet.cpp
73
 
AM_CPPFLAGS+=@LIBPANELAPPLETMM_CFLAGS@
74
 
GNOTE_LIBS+=@LIBPANELAPPLETMM_LIBS@
 
71
AM_CPPFLAGS+=@LIBPANELAPPLET_CFLAGS@
 
72
GNOTE_LIBS+=@LIBPANELAPPLET_LIBS@
75
73
 
76
74
libexec_SCRIPTS=gnote-applet
77
75
gnote-applet: gnote-applet.in Makefile
82
80
endif
83
81
 
84
82
 
85
 
if HAVE_DBUS
86
83
SUBDIRS += dbus
87
84
DBUS_SOURCES=remotecontrolproxy.hpp remotecontrolproxy.cpp \
88
85
        dbus/remotecontrol.hpp dbus/remotecontrol.cpp \
89
86
        dbus/remotecontrolclient.hpp dbus/remotecontrolclient.cpp \
90
87
        dbus/iremotecontrol.hpp \
 
88
        dbus/remotecontrol-client-glue.cpp \
 
89
        dbus/remotecontrol-glue.cpp \
91
90
        $(NULL)
92
 
endif
93
91
 
94
92
libgnote_a_SOURCES = \
95
93
        base/singleton.hpp \