← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to shell/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:
shell/Makefile.am
1
 
if HAVE_LIBSLAB_DEPS
2
 
REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
3
 
REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la
4
 
else
5
 
REAL_LIBSLAB_CFLAGS = $(EXTERNAL_LIBSLAB_CFLAGS)
6
 
REAL_LIBSLAB_LIBS = $(EXTERNAL_LIBSLAB_LIBS)
7
 
endif
8
 
 
9
1
INCLUDES =                                      \
10
2
        -I$(top_srcdir)                         \
11
 
        $(REAL_LIBSLAB_CFLAGS)                  \
12
 
        $(GNOMECC_SHELL_CFLAGS)
13
 
 
14
 
bin_PROGRAMS = gnome-control-center 
15
 
 
16
 
gnome_control_center_SOURCES =          \
17
 
        control-center.c
18
 
 
19
 
gnome_control_center_LDADD =                                            \
20
 
        $(GNOMECC_SHELL_LIBS)                                           \
21
 
        $(REAL_LIBSLAB_LIBS)
 
3
        -I$(top_srcdir)/libgnome-control-center \
 
4
        $(SHELL_CFLAGS)
 
5
 
 
6
bin_PROGRAMS = gnome-control-center
 
7
 
 
8
MARSHAL_FILES = cc-shell-marshal.c cc-shell-marshal.h
 
9
BUILT_SOURCES = $(MARSHAL_FILES)
 
10
 
 
11
cc-shell-marshal.h: cc-shell-marshal.list
 
12
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=cc_shell_marshal $< --header > $@
 
13
 
 
14
cc-shell-marshal.c: cc-shell-marshal.list
 
15
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=cc_shell_marshal $< --body --header > $@
 
16
 
 
17
gnome_control_center_SOURCES =                  \
 
18
        control-center.c                        \
 
19
        cc-shell-log.c                          \
 
20
        cc-shell-log.h                          \
 
21
        gnome-control-center.c                  \
 
22
        gnome-control-center.h                  \
 
23
        shell-search-renderer.c                 \
 
24
        shell-search-renderer.h                 \
 
25
        cc-shell-category-view.c                \
 
26
        cc-shell-category-view.h                \
 
27
        cc-shell-item-view.c                    \
 
28
        cc-shell-item-view.h                    \
 
29
        cc-shell-model.c                        \
 
30
        cc-shell-model.h                        \
 
31
        $(MARSHAL_FILES)
 
32
 
 
33
gnome_control_center_LDADD =                    \
 
34
        $(top_builddir)/libgnome-control-center/libgnome-control-center.la \
 
35
        $(SHELL_LIBS)
 
36
 
 
37
gnome_control_center_LDFLAGS = -export-dynamic
22
38
 
23
39
AM_CPPFLAGS =                                                   \
24
 
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""
 
40
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""                \
 
41
        -DUIDIR="\"$(uidir)\""                                  \
 
42
        -DMENUDIR="\"$(menudir)\""                              \
 
43
        -DPANELS_DIR="\"$(PANELS_DIR)\""
 
44
 
 
45
menudir = $(sysconfdir)/xdg/menus
 
46
menu_DATA = gnomecc.menu
 
47
 
 
48
uidir = $(pkgdatadir)/ui
 
49
ui_DATA = shell.ui
25
50
 
26
51
sysdir = $(datadir)/applications
27
 
sys_in_files = gnomecc.desktop.in
 
52
sys_in_files = gnome-control-center.desktop.in
28
53
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
29
54
@INTLTOOL_DESKTOP_RULE@
30
55
 
33
58
directory_DATA = $(directory_in_files:.directory.in=.directory)
34
59
@INTLTOOL_DIRECTORY_RULE@
35
60
 
36
 
schemasdir   = @GCONF_SCHEMA_FILE_DIR@
37
 
schemas_DATA = control-center.schemas
38
 
@INTLTOOL_SCHEMAS_RULE@
39
 
 
40
 
install-data-local: $(schema_DATA)
41
 
if GCONF_SCHEMAS_INSTALL
42
 
        if test -z "$(DESTDIR)" ; then \
43
 
                for p in $^ ; do \
44
 
                        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
45
 
                done \
46
 
        fi
47
 
endif
48
 
 
49
 
menudir = $(sysconfdir)/xdg/menus
50
 
menu_DATA = gnomecc.menu
51
 
 
52
 
EXTRA_DIST = gnomecc.desktop.in.in gnomecc.directory.in gnomecc.menu $(schemas_DATA).in
53
 
 
54
 
DISTCLEANFILES = gnomecc.desktop gnomecc.desktop.in gnomecc.directory $(schemas_DATA)
 
61
EXTRA_DIST =                                    \
 
62
        $(ui_DATA)                              \
 
63
        gnome-control-center.desktop.in.in      \
 
64
        gnomecc.directory.in                    \
 
65
        gnomecc.menu                            \
 
66
        cc-shell-marshal.list
 
67
 
 
68
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory
55
69
 
56
70
-include $(top_srcdir)/git.mk