From 48b9521cbb2bd6c4caaba9b6c24fdb6e264f58c5 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 14 Jun 2011 22:08:55 +0200
Subject: [PATCH] gail-util: Move into toplevel directory

---
 Makefile.am                                            | 2 +-
 configure.ac                                           | 2 +-
 gtk/a11y/Makefile.am                                   | 2 +-
 {gtk/a11y/libgail-util => libgail-util}/Makefile.am    | 0
 {gtk/a11y/libgail-util => libgail-util}/gail-util.h    | 0
 {gtk/a11y/libgail-util => libgail-util}/gailmisc.c     | 0
 {gtk/a11y/libgail-util => libgail-util}/gailmisc.h     | 0
 {gtk/a11y/libgail-util => libgail-util}/gailtextutil.c | 0
 {gtk/a11y/libgail-util => libgail-util}/gailtextutil.h | 0
 {gtk/a11y/libgail-util => libgail-util}/gailutil.def   | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename {gtk/a11y/libgail-util => libgail-util}/Makefile.am (100%)
 rename {gtk/a11y/libgail-util => libgail-util}/gail-util.h (100%)
 rename {gtk/a11y/libgail-util => libgail-util}/gailmisc.c (100%)
 rename {gtk/a11y/libgail-util => libgail-util}/gailmisc.h (100%)
 rename {gtk/a11y/libgail-util => libgail-util}/gailtextutil.c (100%)
 rename {gtk/a11y/libgail-util => libgail-util}/gailtextutil.h (100%)
 rename {gtk/a11y/libgail-util => libgail-util}/gailutil.def (100%)

diff --git a/Makefile.am b/Makefile.am
index 050202dd5..e4818baad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 9197b6c07..89f965edd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1738,9 +1738,9 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/a11y/Makefile
-gtk/a11y/libgail-util/Makefile
 gtk/a11y/tests/Makefile
 gtk/tests/Makefile
+libgail-util/Makefile
 modules/Makefile
 modules/engines/Makefile
 modules/engines/pixbuf/Makefile
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 427bf2cf8..5d1e3754c 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = libgail-util tests
+SUBDIRS = tests
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
diff --git a/gtk/a11y/libgail-util/Makefile.am b/libgail-util/Makefile.am
similarity index 100%
rename from gtk/a11y/libgail-util/Makefile.am
rename to libgail-util/Makefile.am
diff --git a/gtk/a11y/libgail-util/gail-util.h b/libgail-util/gail-util.h
similarity index 100%
rename from gtk/a11y/libgail-util/gail-util.h
rename to libgail-util/gail-util.h
diff --git a/gtk/a11y/libgail-util/gailmisc.c b/libgail-util/gailmisc.c
similarity index 100%
rename from gtk/a11y/libgail-util/gailmisc.c
rename to libgail-util/gailmisc.c
diff --git a/gtk/a11y/libgail-util/gailmisc.h b/libgail-util/gailmisc.h
similarity index 100%
rename from gtk/a11y/libgail-util/gailmisc.h
rename to libgail-util/gailmisc.h
diff --git a/gtk/a11y/libgail-util/gailtextutil.c b/libgail-util/gailtextutil.c
similarity index 100%
rename from gtk/a11y/libgail-util/gailtextutil.c
rename to libgail-util/gailtextutil.c
diff --git a/gtk/a11y/libgail-util/gailtextutil.h b/libgail-util/gailtextutil.h
similarity index 100%
rename from gtk/a11y/libgail-util/gailtextutil.h
rename to libgail-util/gailtextutil.h
diff --git a/gtk/a11y/libgail-util/gailutil.def b/libgail-util/gailutil.def
similarity index 100%
rename from gtk/a11y/libgail-util/gailutil.def
rename to libgail-util/gailutil.def
-- 
2.43.2