diff options
author | Brian Cameron <Brian.Cameron@sun.com> | 2005-09-21 04:10:23 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2005-09-21 04:10:23 +0000 |
commit | 1a379a8111a6e9175757e6d70709d262e7b8c1b6 (patch) | |
tree | d50b351f6e7322d219b9b2e8116e16b99d359541 /gui | |
parent | 95370af65c32fb8188e1075d75d0543802377620 (diff) | |
download | gdm-1a379a8111a6e9175757e6d70709d262e7b8c1b6.tar.gz |
Add documentation regarding how to set up Automatic Login on Solaris.
2005-09-20 Brian Cameron <Brian.Cameron@sun.com>
* README.install, pam_allow.c: Add documentation
regarding how to set up Automatic Login on
Solaris.
* daemon/Makefile.am, gui/Makefile.am,
gui/greeter/Makefile.am, gui/modules/Makefile.am,
vicious-extensions/Makefile.am: Remove
illegal reference to build directory in installed
.la files. Fixes bug #316793, patch provided by
Stanislav Brabec <sbrabec@suse.cz>.
* gui/gdmlogin.c: Fix comment for translators to
make it more clear that %l is a strftime option
for 12 hour format. Fixes bug #316773.
Diffstat (limited to 'gui')
-rw-r--r-- | gui/Makefile.am | 21 | ||||
-rw-r--r-- | gui/gdmlogin.c | 3 | ||||
-rw-r--r-- | gui/greeter/Makefile.am | 3 | ||||
-rw-r--r-- | gui/modules/Makefile.am | 6 |
4 files changed, 12 insertions, 21 deletions
diff --git a/gui/Makefile.am b/gui/Makefile.am index 364e9323..ac2c6ca1 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -101,8 +101,7 @@ gdmchooser_LDADD = \ $(PANGO_LIBS) \ $(GDK_LIBS) \ $(GDKPIXBUF_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui + $(top_builddir)/vicious-extensions/libviciousui.a gdmlogin_LDADD = \ libgdmwm.a \ @@ -120,8 +119,7 @@ gdmlogin_LDADD = \ $(GDKPIXBUF_LIBS) \ $(LIBGNOME_LIBS) \ $(LIBGNOMEUI_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-minimal + $(top_builddir)/vicious-extensions/libviciousui-minimal.a gdmsetup_LDFLAGS = -export-dynamic gdmsetup_LDADD = \ @@ -138,8 +136,7 @@ gdmsetup_LDADD = \ $(LIBGNOME_LIBS) \ $(LIBGNOMEUI_LIBS) \ $(EXTRA_SETUP_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-gnome + $(top_builddir)/vicious-extensions/libviciousui-gnome.a gdmphotosetup_LDADD = \ libgdmcommon.a \ @@ -152,8 +149,7 @@ gdmphotosetup_LDADD = \ $(LIBGNOME_LIBS) \ $(LIBGNOMEUI_LIBS) \ $(INTLLIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-gnome + $(top_builddir)/vicious-extensions/libviciousui-gnome.a gdmXnestchooser_LDADD = \ libgdmcommon.a \ @@ -167,8 +163,7 @@ gdmXnestchooser_LDADD = \ $(LIBGNOME_LIBS) \ $(LIBGNOMEUI_LIBS) \ $(EXTRA_XNEST_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-gnome + $(top_builddir)/vicious-extensions/libviciousui-gnome.a gdmflexiserver_LDADD = \ libgdmcommon.a \ @@ -181,8 +176,7 @@ gdmflexiserver_LDADD = \ $(LIBGNOME_LIBS) \ $(LIBGNOMEUI_LIBS) \ $(EXTRA_FLEXI_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-gnome + $(top_builddir)/vicious-extensions/libviciousui-gnome.a gdmdynamic_LDADD = \ libgdmcommon.a \ @@ -195,8 +189,7 @@ gdmdynamic_LDADD = \ $(LIBGNOME_LIBS) \ $(LIBGNOMEUI_LIBS) \ $(EXTRA_DYNAMIC_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-gnome + $(top_builddir)/vicious-extensions/libviciousui-gnome.a Settingsdir = $(datadir)/applications Settings_files = gdmphotosetup.desktop diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index 1122a241..9f6d6df4 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -2630,7 +2630,8 @@ update_clock (gpointer data) } else { /* Translators: You should translate time part as %H:%M if your language does not have AM and PM - equivalent. */ + equivalent. Note: %l is a strftime option for + 12-hour clock format */ str = ve_strftime (the_tm, _("%a %b %d, %l:%M %p")); } diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am index 4a9290f8..c65707b9 100644 --- a/gui/greeter/Makefile.am +++ b/gui/greeter/Makefile.am @@ -65,8 +65,7 @@ gdmgreeter_LDADD = \ -L$(top_builddir)/gui \ -lgdmwm \ -lgdmcommon \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui-minimal \ + $(top_builddir)/vicious-extensions/libviciousui-minimal.a \ $(X_LIBS) \ -lX11 \ $(XINERAMA_LIBS) \ diff --git a/gui/modules/Makefile.am b/gui/modules/Makefile.am index a117a039..c1fd649c 100644 --- a/gui/modules/Makefile.am +++ b/gui/modules/Makefile.am @@ -23,8 +23,7 @@ libkeymouselistener_la_LDFLAGS = \ $(GUI_LIBS) \ $(X_LIBS) \ $(X_EXTRA_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui + $(top_builddir)/vicious-extensions/libviciousui.a libdwellmouselistener_la_SOURCES = \ dwellmouselistener.c @@ -34,8 +33,7 @@ libdwellmouselistener_la_LDFLAGS = \ $(GUI_LIBS) \ $(X_LIBS) \ $(X_EXTRA_LIBS) \ - -L$(top_builddir)/vicious-extensions \ - -lviciousui + $(top_builddir)/vicious-extensions/libviciousui.a moduledir = $(libdir)/gtk-2.0/modules |