[gnome-initial-setup] Move gdm-languages to share this object with other pages

[Jasper St. Pierre <jstpierre src gnome org>]

commit a80acef5914bab31db98f67ae8d957929cdaa96a
Author: Michael Wood <michael g wood intel com>
Date:   Fri Dec 7 17:39:48 2012 +0000

    Move gdm-languages to share this object with other pages
    
    gdm-languages is also going to be used by the keyboard selection so lets
    share it.

 gnome-initial-setup/Makefile.am                    |    6 +++++-
 .../{pages/language => }/gdm-languages.c           |    0
 .../{pages/language => }/gdm-languages.h           |    0
 .../{pages/language => }/locarchive.h              |    0
 gnome-initial-setup/pages/language/Makefile.am     |    3 ---
 5 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 56295d5..fd4f658 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -5,7 +5,9 @@ uidir = $(datadir)/gnome-initial-setup
 AM_CPPFLAGS = \
 	$(INITIAL_SETUP_CFLAGS) \
 	-DUIDIR="\"$(uidir)\"" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+	-DDATADIR=\""$(datadir)"\"
 
 libexec_PROGRAMS = gnome-initial-setup gnome-initial-setup-copy-worker
 
@@ -26,6 +28,8 @@ BUILT_SOURCES += setup_resources.c
 gnome_initial_setup_SOURCES =	\
 	gnome-initial-setup.c gnome-initial-setup.h \
 	cc-notebook.c cc-notebook.h \
+	gdm-languages.c gdm-languages.h \
+	locarchive.h \
 	gis-assistant.c gis-assistant.h gis-assistant-private.h \
 	gis-assistant-gtk.c gis-assistant-gtk.h \
 	gis-page.c gis-page.h \
diff --git a/gnome-initial-setup/pages/language/gdm-languages.c b/gnome-initial-setup/gdm-languages.c
similarity index 100%
rename from gnome-initial-setup/pages/language/gdm-languages.c
rename to gnome-initial-setup/gdm-languages.c
diff --git a/gnome-initial-setup/pages/language/gdm-languages.h b/gnome-initial-setup/gdm-languages.h
similarity index 100%
rename from gnome-initial-setup/pages/language/gdm-languages.h
rename to gnome-initial-setup/gdm-languages.h
diff --git a/gnome-initial-setup/pages/language/locarchive.h b/gnome-initial-setup/locarchive.h
similarity index 100%
rename from gnome-initial-setup/pages/language/locarchive.h
rename to gnome-initial-setup/locarchive.h
diff --git a/gnome-initial-setup/pages/language/Makefile.am b/gnome-initial-setup/pages/language/Makefile.am
index 5095c76..117fbd1 100644
--- a/gnome-initial-setup/pages/language/Makefile.am
+++ b/gnome-initial-setup/pages/language/Makefile.am
@@ -6,13 +6,10 @@ AM_CPPFLAGS = \
 	-I"$(top_srcdir)/gnome-initial-setup" \
 	-I"$(top_builddir)" \
 	-DDATADIR=\""$(datadir)"\" \
-	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 libgislanguage_la_SOURCES =	\
 	cc-common-language.c cc-common-language.h \
-	gdm-languages.c gdm-languages.h \
-	locarchive.h \
 	gis-language-page.c gis-language-page.h
 
 libgislanguage_la_CFLAGS = $(INITIAL_SETUP_CFLAGS)