diff options
| author | Ray Strode <rstrode@redhat.com> | 2016-08-15 12:53:31 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2016-08-15 12:53:31 -0400 |
| commit | a244bd9196484e824cdd93a9733df46607924d53 (patch) | |
| tree | e3e7a9cf51584b00e3056924bcd9b5f5e79d9ca2 | |
| parent | 7deeb805a59fa772c1b79e3b2c1d60fb4757e665 (diff) | |
| download | gdm-a244bd9196484e824cdd93a9733df46607924d53.tar.gz | |
build-goo: get rid of gui directory
It only has the chooser in it, so just move the chooser to the toplevel.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | chooser/Makefile.am (renamed from gui/simple-chooser/Makefile.am) | 0 | ||||
| -rw-r--r-- | chooser/chooser-main.c (renamed from gui/simple-chooser/chooser-main.c) | 0 | ||||
| -rw-r--r-- | chooser/gdm-chooser-host.c (renamed from gui/simple-chooser/gdm-chooser-host.c) | 0 | ||||
| -rw-r--r-- | chooser/gdm-chooser-host.h (renamed from gui/simple-chooser/gdm-chooser-host.h) | 0 | ||||
| -rw-r--r-- | chooser/gdm-chooser-session.c (renamed from gui/simple-chooser/gdm-chooser-session.c) | 0 | ||||
| -rw-r--r-- | chooser/gdm-chooser-session.h (renamed from gui/simple-chooser/gdm-chooser-session.h) | 0 | ||||
| -rw-r--r-- | chooser/gdm-host-chooser-dialog.c (renamed from gui/simple-chooser/gdm-host-chooser-dialog.c) | 0 | ||||
| -rw-r--r-- | chooser/gdm-host-chooser-dialog.h (renamed from gui/simple-chooser/gdm-host-chooser-dialog.h) | 0 | ||||
| -rw-r--r-- | chooser/gdm-host-chooser-widget.c (renamed from gui/simple-chooser/gdm-host-chooser-widget.c) | 0 | ||||
| -rw-r--r-- | chooser/gdm-host-chooser-widget.h (renamed from gui/simple-chooser/gdm-host-chooser-widget.h) | 0 | ||||
| -rw-r--r-- | chooser/gdm-host-chooser.c (renamed from gui/simple-chooser/gdm-host-chooser.c) | 0 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gui/Makefile.am | 12 |
14 files changed, 2 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 561d695f..7fcfd2b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = \ common \ daemon \ libgdm \ - gui \ + chooser \ utils \ po \ tests \ diff --git a/gui/simple-chooser/Makefile.am b/chooser/Makefile.am index b649d38b..b649d38b 100644 --- a/gui/simple-chooser/Makefile.am +++ b/chooser/Makefile.am diff --git a/gui/simple-chooser/chooser-main.c b/chooser/chooser-main.c index 54aebf17..54aebf17 100644 --- a/gui/simple-chooser/chooser-main.c +++ b/chooser/chooser-main.c diff --git a/gui/simple-chooser/gdm-chooser-host.c b/chooser/gdm-chooser-host.c index 5b76f652..5b76f652 100644 --- a/gui/simple-chooser/gdm-chooser-host.c +++ b/chooser/gdm-chooser-host.c diff --git a/gui/simple-chooser/gdm-chooser-host.h b/chooser/gdm-chooser-host.h index fda6e9f9..fda6e9f9 100644 --- a/gui/simple-chooser/gdm-chooser-host.h +++ b/chooser/gdm-chooser-host.h diff --git a/gui/simple-chooser/gdm-chooser-session.c b/chooser/gdm-chooser-session.c index dd618b8a..dd618b8a 100644 --- a/gui/simple-chooser/gdm-chooser-session.c +++ b/chooser/gdm-chooser-session.c diff --git a/gui/simple-chooser/gdm-chooser-session.h b/chooser/gdm-chooser-session.h index b6d8ccdf..b6d8ccdf 100644 --- a/gui/simple-chooser/gdm-chooser-session.h +++ b/chooser/gdm-chooser-session.h diff --git a/gui/simple-chooser/gdm-host-chooser-dialog.c b/chooser/gdm-host-chooser-dialog.c index 02169502..02169502 100644 --- a/gui/simple-chooser/gdm-host-chooser-dialog.c +++ b/chooser/gdm-host-chooser-dialog.c diff --git a/gui/simple-chooser/gdm-host-chooser-dialog.h b/chooser/gdm-host-chooser-dialog.h index f413091b..f413091b 100644 --- a/gui/simple-chooser/gdm-host-chooser-dialog.h +++ b/chooser/gdm-host-chooser-dialog.h diff --git a/gui/simple-chooser/gdm-host-chooser-widget.c b/chooser/gdm-host-chooser-widget.c index f9200aa0..f9200aa0 100644 --- a/gui/simple-chooser/gdm-host-chooser-widget.c +++ b/chooser/gdm-host-chooser-widget.c diff --git a/gui/simple-chooser/gdm-host-chooser-widget.h b/chooser/gdm-host-chooser-widget.h index 739eac01..739eac01 100644 --- a/gui/simple-chooser/gdm-host-chooser-widget.h +++ b/chooser/gdm-host-chooser-widget.h diff --git a/gui/simple-chooser/gdm-host-chooser.c b/chooser/gdm-host-chooser.c index 47f37d47..47f37d47 100644 --- a/gui/simple-chooser/gdm-host-chooser.c +++ b/chooser/gdm-host-chooser.c diff --git a/configure.ac b/configure.ac index 8f3a8702..3307d806 100644 --- a/configure.ac +++ b/configure.ac @@ -1515,8 +1515,7 @@ AC_CONFIG_FILES([ Makefile daemon/Makefile docs/Makefile -gui/Makefile -gui/simple-chooser/Makefile +chooser/Makefile libgdm/Makefile libgdm/gdm.pc utils/Makefile diff --git a/gui/Makefile.am b/gui/Makefile.am deleted file mode 100644 index 604422c4..00000000 --- a/gui/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -NULL = - -SUBDIRS = \ - $(NULL) - -if XDMCP_SUPPORT -SUBDIRS += simple-chooser -endif - -DIST_SUBDIRS = \ - simple-chooser \ - $(NULL) |