diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | gui/Makefile.am | 2 | ||||
| -rw-r--r-- | gui/simple-chooser/Makefile.am | 6 | ||||
| -rw-r--r-- | libgdm/Makefile.am (renamed from gui/libgdm/Makefile.am) | 0 | ||||
| -rw-r--r-- | libgdm/gdm-client.c (renamed from gui/libgdm/gdm-client.c) | 0 | ||||
| -rw-r--r-- | libgdm/gdm-client.h (renamed from gui/libgdm/gdm-client.h) | 0 | ||||
| -rw-r--r-- | libgdm/gdm-sessions.c (renamed from gui/libgdm/gdm-sessions.c) | 0 | ||||
| -rw-r--r-- | libgdm/gdm-sessions.h (renamed from gui/libgdm/gdm-sessions.h) | 0 | ||||
| -rw-r--r-- | libgdm/gdm-user-switching.c (renamed from gui/libgdm/gdm-user-switching.c) | 0 | ||||
| -rw-r--r-- | libgdm/gdm-user-switching.h (renamed from gui/libgdm/gdm-user-switching.h) | 0 | ||||
| -rw-r--r-- | libgdm/gdm.pc.in (renamed from gui/libgdm/gdm.pc.in) | 0 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
13 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 3880375f..561d695f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,7 @@ SUBDIRS = \ data \ common \ daemon \ + libgdm \ gui \ utils \ po \ diff --git a/configure.ac b/configure.ac index 18d72c19..e822e8fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1557,9 +1557,9 @@ Makefile daemon/Makefile docs/Makefile gui/Makefile -gui/libgdm/Makefile -gui/libgdm/gdm.pc gui/simple-chooser/Makefile +libgdm/Makefile +libgdm/gdm.pc utils/Makefile data/gdm.conf data/Makefile diff --git a/gui/Makefile.am b/gui/Makefile.am index 04da1050..604422c4 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -1,7 +1,6 @@ NULL = SUBDIRS = \ - libgdm \ $(NULL) if XDMCP_SUPPORT @@ -9,6 +8,5 @@ SUBDIRS += simple-chooser endif DIST_SUBDIRS = \ - libgdm \ simple-chooser \ $(NULL) diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am index 7e8e782a..b649d38b 100644 --- a/gui/simple-chooser/Makefile.am +++ b/gui/simple-chooser/Makefile.am @@ -2,8 +2,8 @@ NULL = AM_CPPFLAGS = \ -I$(top_srcdir)/common \ - -I$(top_srcdir)/gui/libgdm \ - -I$(top_builddir)/gui/libgdm \ + -I$(top_srcdir)/libgdm \ + -I$(top_builddir)/libgdm \ -DDATADIR=\""$(datadir)"\" \ -DGDMCONFDIR=\"$(gdmconfdir)\" \ -DDMCONFDIR=\""$(dmconfdir)"\" \ @@ -40,7 +40,7 @@ gdm_simple_chooser_SOURCES = \ gdm_simple_chooser_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - $(top_builddir)/gui/libgdm/libgdm.la \ + $(top_builddir)/libgdm/libgdm.la \ $(GTK_LIBS) \ $(EXTRA_CHOOSER_LIBS) \ $(SIMPLE_CHOOSER_LIBS) \ diff --git a/gui/libgdm/Makefile.am b/libgdm/Makefile.am index 99ada9aa..99ada9aa 100644 --- a/gui/libgdm/Makefile.am +++ b/libgdm/Makefile.am diff --git a/gui/libgdm/gdm-client.c b/libgdm/gdm-client.c index 4542c3ed..4542c3ed 100644 --- a/gui/libgdm/gdm-client.c +++ b/libgdm/gdm-client.c diff --git a/gui/libgdm/gdm-client.h b/libgdm/gdm-client.h index cbe2b389..cbe2b389 100644 --- a/gui/libgdm/gdm-client.h +++ b/libgdm/gdm-client.h diff --git a/gui/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c index 0c51c023..0c51c023 100644 --- a/gui/libgdm/gdm-sessions.c +++ b/libgdm/gdm-sessions.c diff --git a/gui/libgdm/gdm-sessions.h b/libgdm/gdm-sessions.h index 66e99fdd..66e99fdd 100644 --- a/gui/libgdm/gdm-sessions.h +++ b/libgdm/gdm-sessions.h diff --git a/gui/libgdm/gdm-user-switching.c b/libgdm/gdm-user-switching.c index ebfef1c3..ebfef1c3 100644 --- a/gui/libgdm/gdm-user-switching.c +++ b/libgdm/gdm-user-switching.c diff --git a/gui/libgdm/gdm-user-switching.h b/libgdm/gdm-user-switching.h index 2886d503..2886d503 100644 --- a/gui/libgdm/gdm-user-switching.h +++ b/libgdm/gdm-user-switching.h diff --git a/gui/libgdm/gdm.pc.in b/libgdm/gdm.pc.in index 9570d8c5..9570d8c5 100644 --- a/gui/libgdm/gdm.pc.in +++ b/libgdm/gdm.pc.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 4e84df8b..7ae2bb7b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -39,8 +39,8 @@ data/applications/gdm-simple-greeter.desktop.in.in data/applications/gnome-shell.desktop.in data/gdm.schemas.in.in data/org.gnome.login-screen.gschema.xml.in -gui/libgdm/gdm-user-switching.c gui/simple-chooser/gdm-host-chooser-dialog.c gui/simple-chooser/gdm-host-chooser-widget.c +libgdm/gdm-user-switching.c utils/gdmflexiserver.c utils/gdm-screenshot.c |