← Back to branch summary

~cjcurran/gnome-control-center/expose-card-ports

« back to all changes in this revision

Viewing changes to panels/display/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
panels/display/Makefile.am
 
1
# This is used in PANEL_CFLAGS
 
2
cappletname = display
 
3
 
 
4
uidir = $(pkgdatadir)/ui
 
5
dist_ui_DATA = display-capplet.ui
 
6
 
 
7
MARSHALFILES = foo-marshal.c foo-marshal.h
 
8
BUILT_SOURCES = $(MARSHALFILES)
 
9
 
 
10
foo-marshal.c: foo-marshal.h
 
11
        $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=foo_marshal $(srcdir)/foo-marshal.list --header --body > foo-marshal.c )
 
12
foo-marshal.h: foo-marshal.list
 
13
        $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=foo_marshal $(srcdir)/foo-marshal.list --header > foo-marshal.h )
 
14
 
 
15
ccpanelsdir = $(PANELS_DIR)
 
16
ccpanels_LTLIBRARIES = libdisplay.la
 
17
 
 
18
libdisplay_la_SOURCES =         \
 
19
        display-module.c        \
 
20
        cc-display-panel.c      \
 
21
        cc-display-panel.h      \
 
22
        xrandr-capplet.c        \
 
23
        xrandr-capplet.h        \
 
24
        scrollarea.c            \
 
25
        scrollarea.h            \
 
26
        $(MARSHALFILES)
 
27
 
 
28
libdisplay_la_LIBADD = $(DBUS_LIBS) $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS)
 
29
libdisplay_la_LDFLAGS = $(PANEL_LDFLAGS)
 
30
 
 
31
# You will need a recent intltool or the patch from this bug
 
32
# http://bugzilla.gnome.org/show_bug.cgi?id=462312
 
33
@INTLTOOL_POLICY_RULE@
 
34
 
 
35
@INTLTOOL_DESKTOP_RULE@
 
36
 
 
37
icons16dir = $(datadir)/icons/hicolor/16x16/apps
 
38
dist_icons16_DATA = icons/16x16/preferences-desktop-display.png
 
39
icons22dir = $(datadir)/icons/hicolor/22x22/apps
 
40
dist_icons22_DATA = icons/22x22/preferences-desktop-display.png
 
41
icons24dir = $(datadir)/icons/hicolor/24x24/apps
 
42
dist_icons24_DATA = icons/24x24/preferences-desktop-display.png
 
43
icons32dir = $(datadir)/icons/hicolor/32x32/apps
 
44
dist_icons32_DATA = icons/32x32/preferences-desktop-display.png
 
45
iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
 
46
dist_iconssvg_DATA = icons/scalable/preferences-desktop-display.svg
 
47
 
 
48
desktopdir = $(datadir)/applications
 
49
Desktop_in_files = gnome-display-panel.desktop.in
 
50
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
51
 
 
52
INCLUDES   = $(PANEL_CFLAGS) \
 
53
             $(DISPLAY_PANEL_CFLAGS) \
 
54
             -DSBINDIR="\"$(sbindir)\"" \
 
55
             -DUIDIR="\"$(uidir)\"" \
 
56
             -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 
57
             -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 
58
             $(DISABLE_DEPRECATED)
 
59
 
 
60
CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
 
61
 
 
62
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
63
install-data-hook: update-icon-cache
 
64
uninstall-hook: update-icon-cache
 
65
update-icon-cache:
 
66
        @-if test -z "$(DESTDIR)"; then \
 
67
                echo "Updating Gtk icon cache."; \
 
68
                $(gtk_update_icon_cache); \
 
69
        else \
 
70
                echo "*** Icon cache not updated.  After (un)install, run this:"; \
 
71
                echo "***   $(gtk_update_icon_cache)"; \
 
72
        fi
 
73
 
 
74
EXTRA_DIST = foo-marshal.list
 
75
 
 
76
-include $(top_srcdir)/git.mk