← Back to branch summary

~muktupavels/gnome-panel/fix-for-lp-1310929-and-lp-1222339

« back to all changes in this revision

Viewing changes to .pc/clock_applet_needs_terminal.patch/applets/clock/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-19 11:49:35 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20130619114935-e912mx6nwxecoaib
Tags: 1:3.6.2-0ubuntu7
https://launchpad.net/bugs/1185873
* Sync with Debian svn (LP: #1185873). Remaining changes:
  - Use epoch
  - Add apport hook
  - debian/control:
    + Recommend indicator-complete
    + Don't depend on nautilus 3.8 yet
  - debian/patches/14_revert_timedate_change.patch:
    + Dropped, we're using timedated
  - debian/patches/40_unset_menuproxy.patch:
    + Make sure gnome-panel and the applets don't pick up menu proxies.
  - debian/patches/41_classic_layout.patch:
    + Change the defaults to be more "classic Ubuntu": Show indicators
      & show desktop, drop GNOME clock & notification area
  - debian/patches/85_disable_shutdown_on_ltsp.patch:
    + Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/50_ubuntu_sessions.patch:
  - Merge patch from gnome-session to split sessions into GNOME Flashback
    (No effects) using Metacity and GNOME Flashback using Compiz
* debian/patches/51_dont_require_nautilus38.patch:
  - Run Flashback without Nautilus 3.8 since it's not in Saucy yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/clock_applet_needs_terminal.patch/applets/clock/Makefile.am
1
 
SUBDIRS = pixmaps
2
 
 
3
 
noinst_LTLIBRARIES = libsystem-timezone.la
4
 
noinst_PROGRAMS = test-system-timezone
5
 
 
6
 
AM_CPPFLAGS =                           \
7
 
        $(TZ_CFLAGS)                    \
8
 
        $(DISABLE_DEPRECATED_CFLAGS)
9
 
 
10
 
AM_CFLAGS = $(WARN_CFLAGS)
11
 
 
12
 
libsystem_timezone_la_SOURCES = \
13
 
        system-timezone.c       \
14
 
        system-timezone.h
15
 
libsystem_timezone_la_LIBADD = $(TZ_LIBS)
16
 
 
17
 
if ENABLE_EDS
18
 
CALENDAR_SOURCES =              \
19
 
        calendar-client.c       \
20
 
        calendar-client.h       \
21
 
        calendar-sources.c      \
22
 
        calendar-sources.h      \
23
 
        calendar-debug.h
24
 
endif
25
 
 
26
 
CLOCK_SOURCES =                 \
27
 
        calendar-window.c       \
28
 
        calendar-window.h       \
29
 
        clock.c                 \
30
 
        clock.h                 \
31
 
        clock-face.c            \
32
 
        clock-face.h            \
33
 
        clock-location.c        \
34
 
        clock-location.h        \
35
 
        clock-location-tile.c   \
36
 
        clock-location-tile.h   \
37
 
        clock-map.c             \
38
 
        clock-map.h             \
39
 
        clock-sunpos.c          \
40
 
        clock-sunpos.h          \
41
 
        clock-utils.c           \
42
 
        clock-utils.h           \
43
 
        set-timezone.c          \
44
 
        set-timezone.h          \
45
 
        $(BUILT_SOURCES)        \
46
 
        $(CALENDAR_SOURCES)
47
 
 
48
 
CLOCK_CPPFLAGS =                                                \
49
 
        $(AM_CPPFLAGS)                                          \
50
 
        $(LIBPANEL_APPLET_CFLAGS)                               \
51
 
        $(CLOCK_CFLAGS)                                         \
52
 
        $(CLOCK_EDS_CFLAGS)                                     \
53
 
        -I$(srcdir)/../../libpanel-applet                       \
54
 
        -I$(top_builddir)/libpanel-applet                       \
55
 
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
56
 
        -DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\""          \
57
 
        -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
58
 
 
59
 
CLOCK_LDADD =                                           \
60
 
        ../../libpanel-applet/libpanel-applet-4.la      \
61
 
        $(CLOCK_LIBS)                                   \
62
 
        $(CLOCK_EDS_LIBS)                                       \
63
 
        $(LIBPANEL_APPLET_LIBS)                         \
64
 
        libsystem-timezone.la                           \
65
 
        -lm
66
 
 
67
 
test_system_timezone_SOURCES =  \
68
 
        test-system-timezone.c
69
 
test_system_timezone_LDADD = libsystem-timezone.la
70
 
 
71
 
if CLOCK_INPROCESS
72
 
APPLET_IN_PROCESS = true
73
 
APPLET_LOCATION   = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libclock-applet.so
74
 
 
75
 
clock_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
76
 
clock_appletlib_LTLIBRARIES = libclock-applet.la
77
 
libclock_applet_la_SOURCES = $(CLOCK_SOURCES)
78
 
libclock_applet_la_CPPFLAGS = $(CLOCK_CPPFLAGS)
79
 
libclock_applet_la_LIBADD = $(CLOCK_LDADD)
80
 
libclock_applet_la_LDFLAGS = -module -avoid-version
81
 
libclock_applet_la_CFLAGS = $(AM_CFLAGS)
82
 
$(libclock_applet_la_OBJECTS): $(BUILT_SOURCES)
83
 
else
84
 
APPLET_IN_PROCESS = false
85
 
APPLET_LOCATION = $(libexecdir)/clock-applet
86
 
 
87
 
libexec_PROGRAMS = clock-applet
88
 
clock_applet_SOURCES = $(CLOCK_SOURCES)
89
 
clock_applet_CPPFLAGS = $(CLOCK_CPPFLAGS)
90
 
clock_applet_LDADD = $(CLOCK_LDADD)
91
 
clock_applet_CFLAGS = $(AM_CFLAGS)
92
 
$(clock_applet_OBJECTS): $(BUILT_SOURCES)
93
 
endif
94
 
 
95
 
clock-marshallers.c: clock-marshallers.list
96
 
        $(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
97
 
 
98
 
clock-marshallers.h: clock-marshallers.list
99
 
        $(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --internal $< > $@
100
 
 
101
 
clock_enum_headers =                                    \
102
 
        $(top_srcdir)/applets/clock/clock-utils.h
103
 
 
104
 
clock-typebuiltins.c: $(clock_enum_headers)
105
 
        $(AM_V_GEN)glib-mkenums \
106
 
                        --fhead "#include <glib-object.h>\n" \
107
 
                        --fhead "#include \"clock-typebuiltins.h\"\n\n" \
108
 
                        --fprod "\n/* enumerations from \"@filename@\" */" \
109
 
                        --fprod "\n#include \"@filename@\"\n" \
110
 
                        --vhead "static const GEnumValue _@enum_name@_values[] = {" \
111
 
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
112
 
                        --vtail "  { 0, NULL, NULL }\n};\n\n" \
113
 
                        --vtail "GType\n@enum_name@_get_type (void)\n{\n" \
114
 
                        --vtail "  static GType type = 0;\n\n" \
115
 
                        --vtail "  if (!type)\n" \
116
 
                        --vtail "    type = g_enum_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
117
 
                        --vtail "  return type;\n}\n\n" \
118
 
                $(clock_enum_headers) > $@
119
 
 
120
 
clock-typebuiltins.h: $(clock_enum_headers)
121
 
        $(AM_V_GEN)glib-mkenums \
122
 
                        --fhead "#ifndef __CLOCK_TYPEBUILTINS_H__\n" \
123
 
                        --fhead "#define __CLOCK_TYPEBUILTINS_H__ 1\n\n" \
124
 
                        --fhead "G_BEGIN_DECLS\n\n" \
125
 
                        --ftail "G_END_DECLS\n\n" \
126
 
                        --ftail "#endif /* __CLOCK_TYPEBUILTINS_H__ */\n" \
127
 
                        --fprod "\n/* --- @filename@ --- */" \
128
 
                        --eprod "#define CLOCK_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
129
 
                        --eprod "GType @enum_name@_get_type (void);\n" \
130
 
                $(clock_enum_headers) > $@
131
 
 
132
 
BUILT_SOURCES =                                 \
133
 
        clock-marshallers.c                     \
134
 
        clock-marshallers.h                     \
135
 
        clock-resources.c                       \
136
 
        clock-resources.h                       \
137
 
        clock-typebuiltins.c                    \
138
 
        clock-typebuiltins.h
139
 
 
140
 
appletdir       = $(appletsdir)
141
 
applet_in_files = org.gnome.panel.ClockApplet.panel-applet.in
142
 
applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
143
 
 
144
 
$(applet_in_files): $(applet_in_files).in Makefile
145
 
        $(AM_V_GEN)sed \
146
 
                -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
147
 
                -e "s|\@IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
148
 
                -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
149
 
                $< > $@
150
 
 
151
 
@PANEL_INTLTOOL_PANEL_APPLET_RULE@
152
 
 
153
 
if !CLOCK_INPROCESS
154
 
servicedir       = $(datadir)/dbus-1/services
155
 
service_in_files = org.gnome.panel.applet.ClockAppletFactory.service.in
156
 
service_DATA     = $(service_in_files:.service.in=.service)
157
 
 
158
 
org.gnome.panel.applet.ClockAppletFactory.service: $(service_in_files)
159
 
        $(AM_V_GEN)sed \
160
 
                -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
161
 
                $< > $@
162
 
endif
163
 
 
164
 
ui_FILES =              \
165
 
        clock.ui        \
166
 
        clock-menu.xml
167
 
 
168
 
clock-resources.c: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/clock.gresource.xml)
169
 
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
170
 
 
171
 
clock-resources.h: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/clock.gresource.xml)
172
 
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
173
 
 
174
 
EXTRA_DIST =                                            \
175
 
        org.gnome.panel.ClockApplet.panel-applet.in.in  \
176
 
        $(ui_FILES)                                     \
177
 
        clock.gresource.xml                             \
178
 
        clock-marshallers.list                          \
179
 
        $(service_in_files)
180
 
 
181
 
CLEANFILES =                    \
182
 
        $(BUILT_SOURCES)        \
183
 
        $(applet_DATA)          \
184
 
        $(applet_DATA).in       \
185
 
        $(service_DATA)         \
186
 
        $(polkit_DATA)          \
187
 
        $(dbus_services_DATA)
188
 
 
189
 
-include $(top_srcdir)/git.mk