[gnome-initial-setup] language: Remove the separate liblanguage static library

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

commit 477dab6474eac18f91ff6ae79ff91ac880fa14a6
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jul 12 21:02:52 2012 -0400

    language: Remove the separate liblanguage static library

 configure.ac                                       |    1 -
 gnome-initial-setup/Makefile.am                    |    1 -
 gnome-initial-setup/pages/language/Makefile.am     |   10 ++-
 .../language/{languages => }/cc-common-language.c  |    0
 .../language/{languages => }/cc-common-language.h  |    0
 .../pages/language/{languages => }/gdm-languages.c |    0
 .../pages/language/{languages => }/gdm-languages.h |    0
 .../pages/language/gis-language-page.c             |    4 +-
 .../pages/language/languages/Makefile.am           |   25 -----
 .../pages/language/languages/language-chooser.ui   |  114 --------------------
 .../language/{languages => }/list-languages.c      |    0
 .../pages/language/{languages => }/locarchive.h    |    0
 12 files changed, 10 insertions(+), 145 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 718ed55..34efcc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,6 @@ data/Makefile
 gnome-initial-setup/Makefile
 gnome-initial-setup/pages/Makefile
 gnome-initial-setup/pages/language/Makefile
-gnome-initial-setup/pages/language/languages/Makefile
 gnome-initial-setup/pages/eulas/Makefile
 gnome-initial-setup/pages/account/Makefile
 gnome-initial-setup/pages/location/Makefile
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 351fbf1..945b9f4 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -39,7 +39,6 @@ gnome_initial_setup_SOURCES =	\
 
 gnome_initial_setup_LDADD =	\
 	pages/language/libgislanguage.la \
-	pages/language/languages/liblanguage.la \
 	pages/eulas/libgiseulas.la \
 	pages/network/libgisnetwork.la \
 	pages/location/libgislocation.la \
diff --git a/gnome-initial-setup/pages/language/Makefile.am b/gnome-initial-setup/pages/language/Makefile.am
index abb65aa..e7aebe9 100644
--- a/gnome-initial-setup/pages/language/Makefile.am
+++ b/gnome-initial-setup/pages/language/Makefile.am
@@ -1,9 +1,15 @@
 
-SUBDIRS = languages
-
 noinst_LTLIBRARIES = libgislanguage.la
 
+AM_CPPFLAGS = \
+	-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) -I "../.."
diff --git a/gnome-initial-setup/pages/language/languages/cc-common-language.c b/gnome-initial-setup/pages/language/cc-common-language.c
similarity index 100%
rename from gnome-initial-setup/pages/language/languages/cc-common-language.c
rename to gnome-initial-setup/pages/language/cc-common-language.c
diff --git a/gnome-initial-setup/pages/language/languages/cc-common-language.h b/gnome-initial-setup/pages/language/cc-common-language.h
similarity index 100%
rename from gnome-initial-setup/pages/language/languages/cc-common-language.h
rename to gnome-initial-setup/pages/language/cc-common-language.h
diff --git a/gnome-initial-setup/pages/language/languages/gdm-languages.c b/gnome-initial-setup/pages/language/gdm-languages.c
similarity index 100%
rename from gnome-initial-setup/pages/language/languages/gdm-languages.c
rename to gnome-initial-setup/pages/language/gdm-languages.c
diff --git a/gnome-initial-setup/pages/language/languages/gdm-languages.h b/gnome-initial-setup/pages/language/gdm-languages.h
similarity index 100%
rename from gnome-initial-setup/pages/language/languages/gdm-languages.h
rename to gnome-initial-setup/pages/language/gdm-languages.h
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c b/gnome-initial-setup/pages/language/gis-language-page.c
index 8eedd0e..69ba082 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -11,8 +11,8 @@
 
 #include <gtk/gtk.h>
 
-#include "languages/cc-common-language.h"
-#include "languages/gdm-languages.h"
+#include "cc-common-language.h"
+#include "gdm-languages.h"
 
 #define OBJ(type,name) ((type)gtk_builder_get_object(builder,(name)))
 #define WID(name) OBJ(GtkWidget*,name)
diff --git a/gnome-initial-setup/pages/language/languages/list-languages.c b/gnome-initial-setup/pages/language/list-languages.c
similarity index 100%
rename from gnome-initial-setup/pages/language/languages/list-languages.c
rename to gnome-initial-setup/pages/language/list-languages.c
diff --git a/gnome-initial-setup/pages/language/languages/locarchive.h b/gnome-initial-setup/pages/language/locarchive.h
similarity index 100%
rename from gnome-initial-setup/pages/language/languages/locarchive.h
rename to gnome-initial-setup/pages/language/locarchive.h