← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to applets/notification_area/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.3.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 204.
  • Revision ID: james.westby@ubuntu.com-20110530110449-ut1tc5t61rpvf9e3
Tags: upstream-3.0.2
Import upstream version 3.0.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/notification_area/Makefile.am
26
26
        na-tray-manager.c       \
27
27
        na-tray-manager.h
28
28
 
29
 
NOTIFICATION_AREA_SOURCES = main.c
 
29
NOTIFICATION_AREA_SOURCES = main.c main.h
30
30
 
31
31
NOTIFICATION_AREA_LDADD =                               \
32
 
        ../../libpanel-applet/libpanel-applet-3.la      \
 
32
        ../../libpanel-applet/libpanel-applet-4.la      \
33
33
        $(X_LIBS)                                       \
34
34
        $(NOTIFICATION_AREA_LIBS)                       \
35
35
        $(LIBPANEL_APPLET_LIBS)                         \
43
43
 
44
44
if NOTIFICATION_AREA_INPROCESS
45
45
APPLET_IN_PROCESS = true
46
 
APPLET_LOCATION   = $(pkglibdir)/libnotification-area-applet.so
 
46
APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnotification-area-applet.so
47
47
 
48
 
notification_area_appletlibdir = $(pkglibdir)
 
48
notification_area_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
49
49
notification_area_appletlib_LTLIBRARIES = libnotification-area-applet.la
50
50
libnotification_area_applet_la_SOURCES = $(NOTIFICATION_AREA_SOURCES)
51
51
libnotification_area_applet_la_LIBADD = $(NOTIFICATION_AREA_LDADD)
70
70
 
71
71
BUILT_SOURCES = na-marshal.c na-marshal.h
72
72
 
73
 
appletdir       = $(datadir)/gnome-panel/applets
 
73
appletdir       = $(appletsdir)
74
74
applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
75
75
applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
76
76
 
94
94
                $< > $@
95
95
endif
96
96
 
97
 
uidir = $(datadir)/gnome-panel/ui
98
 
ui_DATA = notification-area-menu.xml
99
 
 
100
97
EXTRA_DIST =                                                            \
101
98
        org.gnome.panel.NotificationAreaApplet.panel-applet.in.in       \
102
99
        $(ui_DATA)                                                      \