[gdm/wip/release: 1/4] libgdm: move out of gui/ directory

[Ray Strode <halfline src gnome org>]

commit af4e5855a22af0774f734b2b86ce7afc0a84e6e1
Author: Ray Strode <rstrode redhat com>
Date:   Mon Dec 16 10:52:34 2013 -0500

    libgdm: move out of gui/ directory
    
    libgdm isn't a UI, so it's weird to be in a directory
    called GUI.
    
    This commit moves it up a layer.

 Makefile.am                                 |    1 +
 configure.ac                                |    4 ++--
 gui/Makefile.am                             |    2 --
 gui/simple-chooser/Makefile.am              |    6 +++---
 {gui/libgdm => libgdm}/Makefile.am          |    0
 {gui/libgdm => libgdm}/gdm-client.c         |    0
 {gui/libgdm => libgdm}/gdm-client.h         |    0
 {gui/libgdm => libgdm}/gdm-sessions.c       |    0
 {gui/libgdm => libgdm}/gdm-sessions.h       |    0
 {gui/libgdm => libgdm}/gdm-user-switching.c |    0
 {gui/libgdm => libgdm}/gdm-user-switching.h |    0
 {gui/libgdm => libgdm}/gdm.pc.in            |    0
 po/POTFILES.in                              |    2 +-
 13 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3880375..561d695 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 18d72c1..e822e8f 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 04da105..604422c 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 7e8e782..b649d38 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
similarity index 100%
rename from gui/libgdm/Makefile.am
rename to libgdm/Makefile.am
diff --git a/gui/libgdm/gdm-client.c b/libgdm/gdm-client.c
similarity index 100%
rename from gui/libgdm/gdm-client.c
rename to libgdm/gdm-client.c
diff --git a/gui/libgdm/gdm-client.h b/libgdm/gdm-client.h
similarity index 100%
rename from gui/libgdm/gdm-client.h
rename to libgdm/gdm-client.h
diff --git a/gui/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
similarity index 100%
rename from gui/libgdm/gdm-sessions.c
rename to libgdm/gdm-sessions.c
diff --git a/gui/libgdm/gdm-sessions.h b/libgdm/gdm-sessions.h
similarity index 100%
rename from gui/libgdm/gdm-sessions.h
rename to libgdm/gdm-sessions.h
diff --git a/gui/libgdm/gdm-user-switching.c b/libgdm/gdm-user-switching.c
similarity index 100%
rename from gui/libgdm/gdm-user-switching.c
rename to libgdm/gdm-user-switching.c
diff --git a/gui/libgdm/gdm-user-switching.h b/libgdm/gdm-user-switching.h
similarity index 100%
rename from gui/libgdm/gdm-user-switching.h
rename to libgdm/gdm-user-switching.h
diff --git a/gui/libgdm/gdm.pc.in b/libgdm/gdm.pc.in
similarity index 100%
rename from gui/libgdm/gdm.pc.in
rename to libgdm/gdm.pc.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4e84df8..7ae2bb7 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