← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gnome-panel/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-01-14 22:20:05 UTC
  • mto: (2.1.6 squeeze) (1.3.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 171.
  • Revision ID: james.westby@ubuntu.com-20100114222005-rll7tw9fojl3ac6z
Tags: upstream-2.29.5.1
Import upstream version 2.29.5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/Makefile.am
1
1
## We require new-style dependency handling.
2
2
AUTOMAKE_OPTIONS = 1.3
3
 
SUBDIRS = libpanel-util
 
3
SUBDIRS = libegg libpanel-util
4
4
 
5
5
NULL =
6
6
 
13
13
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
14
14
        -DBUILDERDIR=\""$(uidir)"\"                             \
15
15
        -DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\"          \
 
16
        -DDATADIR=\""$(datadir)"\"                              \
16
17
        -DGMENU_I_KNOW_THIS_IS_UNSTABLE                         \
17
18
        $(DISABLE_DEPRECATED_CFLAGS)                            \
18
 
        $(STANDARD_PROPERTIES_CFLAGS)                           \
19
19
        $(PANEL_CFLAGS)                                         \
20
 
        $(PANELCONFIG_CFLAGS)                                   \
21
20
        $(WARN_CFLAGS)                                          \
22
21
        $(NULL)
23
22
 
154
153
        $(NULL)
155
154
 
156
155
gnome_panel_LDADD =             \
 
156
        $(top_builddir)/gnome-panel/libegg/libegg.la \
157
157
        $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
158
158
        $(PANEL_LIBS)           \
159
159
        $(X_LIBS)