[gnome-initial-setup] Move the rest of the pages to the subdir

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

commit e107c7bb7e92f995391f8f19a29146d941296d75
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jul 12 20:53:02 2012 -0400

    Move the rest of the pages to the subdir

 .gitignore                                         |    2 +-
 configure.ac                                       |    5 ++++-
 gnome-initial-setup/Makefile.am                    |   14 +++++++-------
 gnome-initial-setup/gnome-initial-setup.c          |    6 +++---
 gnome-initial-setup/pages/Makefile.am              |    5 ++++-
 gnome-initial-setup/pages/eulas/Makefile.am        |   12 ++++++++++++
 .../{ => pages/eulas}/gis-eula-pages.c             |    0
 .../{ => pages/eulas}/gis-eula-pages.h             |    0
 gnome-initial-setup/pages/language/Makefile.am     |   11 +++++++++++
 .../{ => pages/language}/gis-language-page.c       |    0
 .../{ => pages/language}/gis-language-page.h       |    0
 .../{ => pages/language}/gis-language-page.ui      |    0
 .../{ => pages/language}/languages/Makefile.am     |    0
 .../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
 .../language}/languages/language-chooser.ui        |    0
 .../language}/languages/list-languages.c           |    0
 .../{ => pages/language}/languages/locarchive.h    |    0
 gnome-initial-setup/pages/summary/Makefile.am      |    9 +++++++++
 .../{ => pages/summary}/gis-summary-page.c         |    0
 .../{ => pages/summary}/gis-summary-page.h         |    0
 .../{ => pages/summary}/gis-summary-page.ui        |    0
 gnome-initial-setup/setup.gresource.xml            |    4 ++--
 25 files changed, 53 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fdc5f3..90dd5d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,6 @@ gnome-initial-setup/gnome-initial-setup
 
 gnome-initial-setup/pages/location/timedated.c
 gnome-initial-setup/pages/location/timedated.h
-gnome-initial-setup/languages/list-languages
+gnome-initial-setup/pages/language/languages/list-languages
 
 gnome-initial-setup.desktop
diff --git a/configure.ac b/configure.ac
index f16aee3..718ed55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,11 +75,14 @@ Makefile
 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
 gnome-initial-setup/pages/network/Makefile
 gnome-initial-setup/pages/goa/Makefile
-gnome-initial-setup/languages/Makefile
+gnome-initial-setup/pages/summary/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 76f2393..351fbf1 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = languages pages
+SUBDIRS = pages
 
 uidir = $(datadir)/gnome-initial-setup
 
@@ -19,12 +19,12 @@ BUILT_SOURCES =
 
 UI_FILES = \
 	setup.ui \
-	gis-language-page.ui \
+	pages/language/gis-language-page.ui \
 	pages/network/gis-network-page.ui \
 	pages/account/gis-account-page.ui \
 	pages/location/gis-location-page.ui \
 	pages/goa/gis-goa-page.ui \
-	gis-summary-page.ui
+	pages/summary/gis-summary-page.ui
 
 setup_resources.c: setup.gresource.xml $(UI_FILES)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/setup.gresource.xml
@@ -35,17 +35,17 @@ gnome_initial_setup_SOURCES =	\
 	cc-notebook.c cc-notebook.h \
 	gis-assistant.c gis-assistant.h \
 	gis-utils.c gis-utils.h \
-	gis-language-page.c gis-language-page.h \
-	gis-eula-pages.c gis-eula-pages.h \
-	gis-summary-page.c gis-summary-page.h \
 	$(BUILT_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 \
 	pages/account/libgisaccount.la \
 	pages/goa/libgisgoa.la \
-	languages/liblanguage.la
+	pages/summary/libgissummary.la
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = welcome-tour.desktop
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 6422291..647e2ce 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -14,13 +14,13 @@
 
 #include "gis-assistant.h"
 
-#include "gis-language-page.h"
-#include "gis-eula-pages.h"
+#include "pages/language/gis-language-page.h"
+#include "pages/eulas/gis-eula-pages.h"
 #include "pages/location/gis-location-page.h"
 #include "pages/account/gis-account-page.h"
 #include "pages/network/gis-network-page.h"
 #include "pages/goa/gis-goa-page.h"
-#include "gis-summary-page.h"
+#include "pages/summary/gis-summary-page.h"
 
 #include "gis-utils.h"
 
diff --git a/gnome-initial-setup/pages/Makefile.am b/gnome-initial-setup/pages/Makefile.am
index 2f82274..4534a47 100644
--- a/gnome-initial-setup/pages/Makefile.am
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -1,6 +1,9 @@
 
 SUBDIRS = \
+	language \
+	eulas \
 	account \
 	location \
 	network \
-	goa
+	goa \
+	summary
diff --git a/gnome-initial-setup/pages/eulas/Makefile.am b/gnome-initial-setup/pages/eulas/Makefile.am
new file mode 100644
index 0000000..c9639c8
--- /dev/null
+++ b/gnome-initial-setup/pages/eulas/Makefile.am
@@ -0,0 +1,12 @@
+
+noinst_LTLIBRARIES = libgiseulas.la
+
+AM_CPPFLAGS = \
+	-DUIDIR="\"$(uidir)\""
+
+libgiseulas_la_SOURCES =	\
+	gis-eula-pages.c gis-eula-pages.h
+
+libgiseulas_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgiseulas_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgiseulas_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/gis-eula-pages.c b/gnome-initial-setup/pages/eulas/gis-eula-pages.c
similarity index 100%
rename from gnome-initial-setup/gis-eula-pages.c
rename to gnome-initial-setup/pages/eulas/gis-eula-pages.c
diff --git a/gnome-initial-setup/gis-eula-pages.h b/gnome-initial-setup/pages/eulas/gis-eula-pages.h
similarity index 100%
rename from gnome-initial-setup/gis-eula-pages.h
rename to gnome-initial-setup/pages/eulas/gis-eula-pages.h
diff --git a/gnome-initial-setup/pages/language/Makefile.am b/gnome-initial-setup/pages/language/Makefile.am
new file mode 100644
index 0000000..abb65aa
--- /dev/null
+++ b/gnome-initial-setup/pages/language/Makefile.am
@@ -0,0 +1,11 @@
+
+SUBDIRS = languages
+
+noinst_LTLIBRARIES = libgislanguage.la
+
+libgislanguage_la_SOURCES =	\
+	gis-language-page.c gis-language-page.h
+
+libgislanguage_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgislanguage_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgislanguage_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/gis-language-page.c b/gnome-initial-setup/pages/language/gis-language-page.c
similarity index 100%
rename from gnome-initial-setup/gis-language-page.c
rename to gnome-initial-setup/pages/language/gis-language-page.c
diff --git a/gnome-initial-setup/gis-language-page.h b/gnome-initial-setup/pages/language/gis-language-page.h
similarity index 100%
rename from gnome-initial-setup/gis-language-page.h
rename to gnome-initial-setup/pages/language/gis-language-page.h
diff --git a/gnome-initial-setup/gis-language-page.ui b/gnome-initial-setup/pages/language/gis-language-page.ui
similarity index 100%
rename from gnome-initial-setup/gis-language-page.ui
rename to gnome-initial-setup/pages/language/gis-language-page.ui
diff --git a/gnome-initial-setup/languages/Makefile.am b/gnome-initial-setup/pages/language/languages/Makefile.am
similarity index 100%
rename from gnome-initial-setup/languages/Makefile.am
rename to gnome-initial-setup/pages/language/languages/Makefile.am
diff --git a/gnome-initial-setup/languages/cc-common-language.c b/gnome-initial-setup/pages/language/languages/cc-common-language.c
similarity index 100%
rename from gnome-initial-setup/languages/cc-common-language.c
rename to gnome-initial-setup/pages/language/languages/cc-common-language.c
diff --git a/gnome-initial-setup/languages/cc-common-language.h b/gnome-initial-setup/pages/language/languages/cc-common-language.h
similarity index 100%
rename from gnome-initial-setup/languages/cc-common-language.h
rename to gnome-initial-setup/pages/language/languages/cc-common-language.h
diff --git a/gnome-initial-setup/languages/gdm-languages.c b/gnome-initial-setup/pages/language/languages/gdm-languages.c
similarity index 100%
rename from gnome-initial-setup/languages/gdm-languages.c
rename to gnome-initial-setup/pages/language/languages/gdm-languages.c
diff --git a/gnome-initial-setup/languages/gdm-languages.h b/gnome-initial-setup/pages/language/languages/gdm-languages.h
similarity index 100%
rename from gnome-initial-setup/languages/gdm-languages.h
rename to gnome-initial-setup/pages/language/languages/gdm-languages.h
diff --git a/gnome-initial-setup/languages/language-chooser.ui b/gnome-initial-setup/pages/language/languages/language-chooser.ui
similarity index 100%
rename from gnome-initial-setup/languages/language-chooser.ui
rename to gnome-initial-setup/pages/language/languages/language-chooser.ui
diff --git a/gnome-initial-setup/languages/list-languages.c b/gnome-initial-setup/pages/language/languages/list-languages.c
similarity index 100%
rename from gnome-initial-setup/languages/list-languages.c
rename to gnome-initial-setup/pages/language/languages/list-languages.c
diff --git a/gnome-initial-setup/languages/locarchive.h b/gnome-initial-setup/pages/language/languages/locarchive.h
similarity index 100%
rename from gnome-initial-setup/languages/locarchive.h
rename to gnome-initial-setup/pages/language/languages/locarchive.h
diff --git a/gnome-initial-setup/pages/summary/Makefile.am b/gnome-initial-setup/pages/summary/Makefile.am
new file mode 100644
index 0000000..0d9543f
--- /dev/null
+++ b/gnome-initial-setup/pages/summary/Makefile.am
@@ -0,0 +1,9 @@
+
+noinst_LTLIBRARIES = libgissummary.la
+
+libgissummary_la_SOURCES =	\
+	gis-summary-page.c gis-summary-page.h
+
+libgissummary_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgissummary_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgissummary_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
similarity index 100%
rename from gnome-initial-setup/gis-summary-page.c
rename to gnome-initial-setup/pages/summary/gis-summary-page.c
diff --git a/gnome-initial-setup/gis-summary-page.h b/gnome-initial-setup/pages/summary/gis-summary-page.h
similarity index 100%
rename from gnome-initial-setup/gis-summary-page.h
rename to gnome-initial-setup/pages/summary/gis-summary-page.h
diff --git a/gnome-initial-setup/gis-summary-page.ui b/gnome-initial-setup/pages/summary/gis-summary-page.ui
similarity index 100%
rename from gnome-initial-setup/gis-summary-page.ui
rename to gnome-initial-setup/pages/summary/gis-summary-page.ui
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index 7e6e637..a4c83ba 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -2,12 +2,12 @@
 <gresources>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">setup.ui</file>
-    <file preprocess="xml-stripblanks">gis-language-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-language-page.ui">pages/language/gis-language-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-account-page.ui">pages/account/gis-account-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-location-page.ui">pages/location/gis-location-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-network-page.ui">pages/network/gis-network-page.ui</file>
     <file preprocess="xml-stripblanks" alias="gis-goa-page.ui">pages/goa/gis-goa-page.ui</file>
-    <file preprocess="xml-stripblanks">gis-summary-page.ui</file>
+    <file preprocess="xml-stripblanks" alias="gis-summary-page.ui">pages/summary/gis-summary-page.ui</file>
   </gresource>
 </gresources>