← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/00_disable-nm.patch/panels/network/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:
.pc/00_disable-nm.patch/panels/network/Makefile.am
 
1
cappletname = network
 
2
 
 
3
INCLUDES =                                              \
 
4
        $(PANEL_CFLAGS)                                 \
 
5
        $(NETWORK_PANEL_CFLAGS)                         \
 
6
        $(NETWORK_MANAGER_CFLAGS)                       \
 
7
        -DGNOMECC_UI_DIR="\"$(uidir)\""                 \
 
8
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""        \
 
9
        -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""          \
 
10
        $(NULL)
 
11
 
 
12
ccpanelsdir = $(PANELS_DIR)
 
13
ccpanels_LTLIBRARIES = libnetwork.la
 
14
 
 
15
libnetwork_la_SOURCES =                                 \
 
16
        network-module.c                                \
 
17
        panel-common.c                                  \
 
18
        panel-common.h                                  \
 
19
        net-object.c                                    \
 
20
        net-object.h                                    \
 
21
        net-device.c                                    \
 
22
        net-device.h                                    \
 
23
        net-vpn.c                                       \
 
24
        net-vpn.h                                       \
 
25
        panel-cell-renderer-mode.c                      \
 
26
        panel-cell-renderer-mode.h                      \
 
27
        panel-cell-renderer-security.c                  \
 
28
        panel-cell-renderer-security.h                  \
 
29
        panel-cell-renderer-signal.c                    \
 
30
        panel-cell-renderer-signal.h                    \
 
31
        cc-network-panel.c                              \
 
32
        cc-network-panel.h
 
33
 
 
34
libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS)
 
35
libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS)
 
36
 
 
37
uidir = $(pkgdatadir)/ui
 
38
dist_ui_DATA = network.ui
 
39
 
 
40
@INTLTOOL_DESKTOP_RULE@
 
41
 
 
42
desktopdir = $(datadir)/applications
 
43
desktop_in_files = gnome-network-panel.desktop.in
 
44
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
45
 
 
46
CLEANFILES = $(desktop_in_files) $(desktop_DATA)
 
47
 
 
48
-include $(top_srcdir)/git.mk