← Back to branch summary

~ubuntu-branches/ubuntu/vivid/liferea/vivid-proposed

« back to all changes in this revision

Viewing changes to src/notification/Makefile.am

  • Committer: Package Import Robot
  • Author(s): bojo42
  • Date: 2012-03-29 14:17:21 UTC
  • mfrom: (1.3.9) (3.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20120329141721-tbfopcrc5797wxt7
Tags: 1.8.3-0.1ubuntu1
https://launchpad.net/bugs/290666
https://launchpad.net/bugs/371754
https://launchpad.net/bugs/741543
https://launchpad.net/bugs/716688
https://launchpad.net/bugs/935147
* New upstream release (LP: #290666, #371754, #741543, #716688)
* Merge from Debian unstable (LP: #935147), remaining changes:
* debian/patches:
  - drop gtk-status-icon.patch & notification-append as in upstream
  - drop fix_systray_behavior as mostly upstreamed and rest seems unused
  - 01_ubuntu_feedlists: update & rename, move planets to "Open Source"  
  - add_X-Ubuntu-Gettext-Domain: rebase
  - libunity.patch: rebase, apply before indicator patch (liferea_shell.c)
  - libindicate_increase_version.patch: exclude from libindicate.patch
  - deactivate libindicate.patch, seems partly upstreamed and needs rework
* debian/control: libindicate-dev, libindicate-gtk-dev & libunity-dev
* debian/liferea.indicate & liferea.install: ship indicator desktop file
* debian/rules: enable libindicate

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/notification/Makefile.am
1
1
## Process this file with automake to produce Makefile.in
2
2
 
3
 
INCLUDES = \
 
3
AM_CPPFLAGS = \
4
4
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
5
5
        -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \
6
6
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
7
7
        -I$(top_srcdir)/src \
8
 
        $(PACKAGE_CFLAGS) \
9
 
        $(DBUS_CFLAGS)
10
 
 
11
 
# generic notification support
12
 
noinst_LIBRARIES = libnotification.a
13
 
 
14
 
libnotification_a_SOURCES = notification.c notification.h 
15
 
libnotification_a_CFLAGS = $(PACKAGE_CFLAGS)
 
8
        $(PACKAGE_CFLAGS)
16
9
 
17
10
if WITH_LIBNOTIFY
18
11
 
19
 
# libnotify popup plugin
20
 
liblinotiflibnotify_la_LIBADD = $(PACKAGE_LIBS) $(LIBNOTIFY_LIBS)
21
 
liblinotiflibnotify_la_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS)
22
 
liblinotiflibnotify_la_SOURCES = libnotify.c notification.h
23
 
liblinotiflibnotify_la_LDFLAGS = -avoid-version -module
 
12
libnotify_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS)
 
13
libnotify_a_SOURCES = libnotify.c notification.c notification.h
24
14
 
25
 
pkglib_LTLIBRARIES = liblinotiflibnotify.la
 
15
noinst_LIBRARIES = libnotify.a
26
16
endif