← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-panel/trusty

« back to all changes in this revision

Viewing changes to applets/clock/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Tim Lunn, Tim Lunn, Jeremy Bicha
  • Date: 2013-05-28 11:55:23 UTC
  • Revision ID: package-import@ubuntu.com-20130528115523-5xjvb98au715s7zn
Tags: 1:3.6.2-0ubuntu4
https://launchpad.net/bugs/1184812
https://launchpad.net/bugs/1184168
[ Tim Lunn ]
* Rebuild for gnome-desktop 3.8 transition (LP: #1184812)
  - debian/patches/git_panel_run_dialog_resurrect_terminal.patch 
    clock_applet_needs_terminal.patch

[ Jeremy Bicha ]
* git-build-with-gweather38.patch:
  - Backport patch to build with gweather 3.8 (LP: #1184168) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/clock/Makefile.am
52
52
        $(CLOCK_EDS_CFLAGS)                                     \
53
53
        -I$(srcdir)/../../libpanel-applet                       \
54
54
        -I$(top_builddir)/libpanel-applet                       \
 
55
    -I$(top_builddir)/gnome-panel/libpanel-util                 \
55
56
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
56
57
        -DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\""          \
57
58
        -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
58
59
 
59
60
CLOCK_LDADD =                                           \
60
61
        ../../libpanel-applet/libpanel-applet-4.la      \
 
62
    ../../gnome-panel/libpanel-util/libpanel-util.la \
61
63
        $(CLOCK_LIBS)                                   \
62
64
        $(CLOCK_EDS_LIBS)                                       \
63
65
        $(LIBPANEL_APPLET_LIBS)                         \