← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-session/oneiric-proposed

« back to all changes in this revision

Viewing changes to .pc/80_new_upstream_session_dialog.patch/gnome-session/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-07-11 16:39:56 UTC
  • Revision ID: james.westby@ubuntu.com-20110711163956-16xi409pbfc58ox4
Tags: 3.1.3-0ubuntu2
https://launchpad.net/bugs/802218
* 03_display_session_capplet.patch: display the session properties capplet, 
  the list is cleaned from the system services now and it can be useful 
  for users who want to start softwares with the session (lp: #802218)
* series: comment 80_new_upstream_session_dialog, the modified version never
  went in upstream git and has issues with gtk3, if the upstream dialog is
  not working fine in our desktop we should discuss how to maintain a custom
  session dialog in a better way (lp:807503)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/80_new_upstream_session_dialog.patch/gnome-session/Makefile.am
1
 
bin_PROGRAMS = gnome-session
2
 
noinst_LTLIBRARIES = libgsmutil.la
3
 
noinst_PROGRAMS =               \
4
 
        test-client-dbus        \
5
 
        test-inhibit            \
6
 
        test-process-helper
7
 
 
8
 
AM_CPPFLAGS =                                   \
9
 
        $(GNOME_SESSION_CFLAGS)                 \
10
 
        $(DISABLE_DEPRECATED_CFLAGS)
11
 
 
12
 
AM_CFLAGS = $(WARN_CFLAGS)
13
 
 
14
 
gnome_session_SOURCES =                         \
15
 
        gsm-app.h                               \
16
 
        gsm-app.c                               \
17
 
        gsm-autostart-app.h                     \
18
 
        gsm-autostart-app.c                     \
19
 
        gsm-client.c                            \
20
 
        gsm-client.h                            \
21
 
        gsm-xsmp-client.h                       \
22
 
        gsm-xsmp-client.c                       \
23
 
        gsm-dbus-client.h                       \
24
 
        gsm-dbus-client.c                       \
25
 
        gsm-fail-whale-dialog.h                 \
26
 
        gsm-fail-whale-dialog.c                 \
27
 
        gsm-marshal.h                           \
28
 
        gsm-marshal.c                           \
29
 
        gsm-consolekit.c                        \
30
 
        gsm-consolekit.h                        \
31
 
        gsm-logout-dialog.h                     \
32
 
        gsm-logout-dialog.c                     \
33
 
        gsm-icon-names.h                        \
34
 
        gsm-inhibit-dialog.h                    \
35
 
        gsm-inhibit-dialog.c                    \
36
 
        gs-idle-monitor.h                       \
37
 
        gs-idle-monitor.c                       \
38
 
        gsm-presence.h                          \
39
 
        gsm-presence.c                          \
40
 
        gsm-gconf.c                             \
41
 
        gsm-gconf.h                             \
42
 
        gdm.h                                   \
43
 
        gdm.c                                   \
44
 
        gdm-signal-handler.h                    \
45
 
        gdm-signal-handler.c                    \
46
 
        gdm-log.h                               \
47
 
        gdm-log.c                               \
48
 
        main.c                                  \
49
 
        gsm-store.h                             \
50
 
        gsm-store.c                             \
51
 
        gsm-inhibitor.h                         \
52
 
        gsm-inhibitor.c                         \
53
 
        gsm-manager.c                           \
54
 
        gsm-manager.h                           \
55
 
        gsm-process-helper.c                    \
56
 
        gsm-process-helper.h                    \
57
 
        gsm-session-fill.c                      \
58
 
        gsm-session-fill.h                      \
59
 
        gsm-session-save.c                      \
60
 
        gsm-session-save.h                      \
61
 
        gsm-shell.c                             \
62
 
        gsm-shell.h                             \
63
 
        gsm-xsmp-server.c                       \
64
 
        gsm-xsmp-server.h
65
 
 
66
 
gnome_session_CPPFLAGS =                        \
67
 
        $(AM_CPPFLAGS)                          \
68
 
        $(SM_CFLAGS)                            \
69
 
        $(ICE_CFLAGS)                           \
70
 
        $(XEXT_CFLAGS)                          \
71
 
        $(GCONF_CFLAGS)                         \
72
 
        -I$(top_srcdir)/egg                     \
73
 
        -DLOCALE_DIR=\""$(datadir)/locale"\"    \
74
 
        -DDATA_DIR=\""$(datadir)/gnome-session"\" \
75
 
        -DLIBEXECDIR=\"$(libexecdir)\"          \
76
 
        -DGTKBUILDER_DIR=\""$(pkgdatadir)"\"    \
77
 
        -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
78
 
        -DGCONFTOOL_CMD=\"$(GCONFTOOL)\"        \
79
 
        -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE
80
 
 
81
 
gnome_session_LDADD =                           \
82
 
        libgsmutil.la                           \
83
 
        $(top_builddir)/egg/libeggdesktopfile.la \
84
 
        $(SM_LIBS)                              \
85
 
        $(ICE_LIBS)                             \
86
 
        $(XRENDER_LIBS)                         \
87
 
        $(XTEST_LIBS)                           \
88
 
        $(XEXT_LIBS)                            \
89
 
        $(GNOME_SESSION_LIBS)                   \
90
 
        $(GCONF_LIBS)                           \
91
 
        $(EXECINFO_LIBS)
92
 
 
93
 
libgsmutil_la_SOURCES =                         \
94
 
        gsm-util.c                              \
95
 
        gsm-util.h
96
 
 
97
 
libgsmutil_la_LIBADD =                          \
98
 
        $(GNOME_SESSION_LIBS)
99
 
 
100
 
test_inhibit_SOURCES = test-inhibit.c
101
 
test_inhibit_LDADD = $(GNOME_SESSION_LIBS)
102
 
 
103
 
test_client_dbus_SOURCES = test-client-dbus.c
104
 
test_client_dbus_LDADD = $(DBUS_GLIB_LIBS)
105
 
 
106
 
test_process_helper_SOURCES = test-process-helper.c gsm-process-helper.c gsm-process-helper.h
107
 
test_process_helper_LDADD = $(DBUS_GLIB_LIBS)
108
 
 
109
 
gsm-marshal.c: gsm-marshal.list
110
 
        $(AM_V_GEN)echo "#include \"gsm-marshal.h\"" > $@ && \
111
 
        $(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --body >> $@
112
 
 
113
 
gsm-marshal.h: gsm-marshal.list
114
 
        $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=gsm_marshal --header > $@
115
 
 
116
 
gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
117
 
        $(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
118
 
 
119
 
gsm-client-glue.h: org.gnome.SessionManager.Client.xml Makefile.am
120
 
        $(AM_V_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
121
 
 
122
 
gsm-app-glue.h: org.gnome.SessionManager.App.xml Makefile.am
123
 
        $(AM_V_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml
124
 
 
125
 
gsm-inhibitor-glue.h: org.gnome.SessionManager.Inhibitor.xml Makefile.am
126
 
        $(AM_V_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
127
 
 
128
 
gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am
129
 
        $(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
130
 
 
131
 
BUILT_SOURCES =                 \
132
 
        gsm-marshal.c           \
133
 
        gsm-marshal.h           \
134
 
        gsm-manager-glue.h      \
135
 
        gsm-presence-glue.h     \
136
 
        gsm-inhibitor-glue.h    \
137
 
        gsm-client-glue.h       \
138
 
        gsm-app-glue.h
139
 
 
140
 
EXTRA_DIST =                                            \
141
 
        README                                          \
142
 
        gsm-marshal.list                                \
143
 
        org.gnome.SessionManager.xml                    \
144
 
        org.gnome.SessionManager.App.xml                \
145
 
        org.gnome.SessionManager.Client.xml             \
146
 
        org.gnome.SessionManager.ClientPrivate.xml      \
147
 
        org.gnome.SessionManager.Inhibitor.xml          \
148
 
        org.gnome.SessionManager.Presence.xml
149
 
 
150
 
CLEANFILES =    \
151
 
        $(BUILT_SOURCES)
152
 
 
153
 
-include $(top_srcdir)/git.mk