[gnome-initial-setup] account: Move page into subdir

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

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

    account: Move page into subdir

 configure.ac                                       |    1 +
 gnome-initial-setup/Makefile.am                    |   14 ++------------
 gnome-initial-setup/gnome-initial-setup.c          |    2 +-
 gnome-initial-setup/pages/Makefile.am              |    1 +
 gnome-initial-setup/pages/account/Makefile.am      |   19 +++++++++++++++++++
 .../{ => pages/account}/gis-account-page.c         |    0
 .../{ => pages/account}/gis-account-page.h         |    0
 .../{ => pages/account}/gis-account-page.ui        |    0
 .../{ => pages/account}/pw-utils-pwquality.c       |    0
 gnome-initial-setup/{ => pages/account}/pw-utils.c |    0
 gnome-initial-setup/{ => pages/account}/pw-utils.h |    0
 .../{ => pages/account}/um-crop-area.c             |    0
 .../{ => pages/account}/um-crop-area.h             |    0
 .../{ => pages/account}/um-photo-dialog.c          |    0
 .../{ => pages/account}/um-photo-dialog.h          |    0
 gnome-initial-setup/{ => pages/account}/um-utils.c |    0
 gnome-initial-setup/{ => pages/account}/um-utils.h |    0
 gnome-initial-setup/setup.gresource.xml            |    2 +-
 18 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3e14e14..e507114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ Makefile
 data/Makefile
 gnome-initial-setup/Makefile
 gnome-initial-setup/pages/Makefile
+gnome-initial-setup/pages/account/Makefile
 gnome-initial-setup/pages/location/Makefile
 gnome-initial-setup/pages/network/Makefile
 gnome-initial-setup/languages/Makefile
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index f9ac671..3cd67a5 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -21,7 +21,7 @@ UI_FILES = \
 	setup.ui \
 	gis-language-page.ui \
 	pages/network/gis-network-page.ui \
-	gis-account-page.ui \
+	pages/account/gis-account-page.ui \
 	pages/location/gis-location-page.ui \
 	gis-goa-page.ui \
 	gis-summary-page.ui
@@ -30,12 +30,6 @@ setup_resources.c: setup.gresource.xml $(UI_FILES)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/setup.gresource.xml
 BUILT_SOURCES += setup_resources.c
 
-if HAVE_PWQUALITY
-pw_utils_sources = pw-utils-pwquality.c pw-utils.h
-else
-pw_utils_sources = pw-utils.c pw-utils.h
-endif
-
 gnome_initial_setup_SOURCES =	\
 	gnome-initial-setup.c gnome-initial-setup.h \
 	cc-notebook.c cc-notebook.h \
@@ -43,19 +37,15 @@ gnome_initial_setup_SOURCES =	\
 	gis-utils.c gis-utils.h \
 	gis-language-page.c gis-language-page.h \
 	gis-eula-pages.c gis-eula-pages.h \
-	gis-account-page.c gis-account-page.h \
 	gis-summary-page.c gis-summary-page.h \
 	gis-goa-page.c gis-goa-page.h \
 	cc-online-accounts-add-account-dialog.c cc-online-accounts-add-account-dialog.h \
-	$(pw_utils_sources) \
-	um-utils.c um-utils.h \
-	um-crop-area.c um-crop-area.h \
-	um-photo-dialog.c um-photo-dialog.h \
 	$(BUILT_SOURCES)
 
 gnome_initial_setup_LDADD =	\
 	pages/network/libgisnetwork.la \
 	pages/location/libgislocation.la \
+	pages/account/libgisaccount.la \
 	languages/liblanguage.la
 
 autostartdir = $(sysconfdir)/xdg/autostart
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 5f80ad6..057e11f 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -17,7 +17,7 @@
 #include "gis-language-page.h"
 #include "gis-eula-pages.h"
 #include "pages/location/gis-location-page.h"
-#include "gis-account-page.h"
+#include "pages/account/gis-account-page.h"
 #include "pages/network/gis-network-page.h"
 #include "gis-goa-page.h"
 #include "gis-summary-page.h"
diff --git a/gnome-initial-setup/pages/Makefile.am b/gnome-initial-setup/pages/Makefile.am
index 16ce829..793fc0b 100644
--- a/gnome-initial-setup/pages/Makefile.am
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -1,4 +1,5 @@
 
 SUBDIRS = \
+	account \
 	location \
 	network
diff --git a/gnome-initial-setup/pages/account/Makefile.am b/gnome-initial-setup/pages/account/Makefile.am
new file mode 100644
index 0000000..3a3b70d
--- /dev/null
+++ b/gnome-initial-setup/pages/account/Makefile.am
@@ -0,0 +1,19 @@
+
+if HAVE_PWQUALITY
+pw_utils_sources = pw-utils-pwquality.c pw-utils.h
+else
+pw_utils_sources = pw-utils.c pw-utils.h
+endif
+
+noinst_LTLIBRARIES = libgisaccount.la
+
+libgisaccount_la_SOURCES =	\
+	$(pw_utils_sources) \
+	um-utils.c um-utils.h \
+	um-crop-area.c um-crop-area.h \
+	um-photo-dialog.c um-photo-dialog.h \
+	gis-account-page.c gis-account-page.h
+
+libgisaccount_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgisaccount_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgisaccount_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/gis-account-page.c b/gnome-initial-setup/pages/account/gis-account-page.c
similarity index 100%
rename from gnome-initial-setup/gis-account-page.c
rename to gnome-initial-setup/pages/account/gis-account-page.c
diff --git a/gnome-initial-setup/gis-account-page.h b/gnome-initial-setup/pages/account/gis-account-page.h
similarity index 100%
rename from gnome-initial-setup/gis-account-page.h
rename to gnome-initial-setup/pages/account/gis-account-page.h
diff --git a/gnome-initial-setup/gis-account-page.ui b/gnome-initial-setup/pages/account/gis-account-page.ui
similarity index 100%
rename from gnome-initial-setup/gis-account-page.ui
rename to gnome-initial-setup/pages/account/gis-account-page.ui
diff --git a/gnome-initial-setup/pw-utils-pwquality.c b/gnome-initial-setup/pages/account/pw-utils-pwquality.c
similarity index 100%
rename from gnome-initial-setup/pw-utils-pwquality.c
rename to gnome-initial-setup/pages/account/pw-utils-pwquality.c
diff --git a/gnome-initial-setup/pw-utils.c b/gnome-initial-setup/pages/account/pw-utils.c
similarity index 100%
rename from gnome-initial-setup/pw-utils.c
rename to gnome-initial-setup/pages/account/pw-utils.c
diff --git a/gnome-initial-setup/pw-utils.h b/gnome-initial-setup/pages/account/pw-utils.h
similarity index 100%
rename from gnome-initial-setup/pw-utils.h
rename to gnome-initial-setup/pages/account/pw-utils.h
diff --git a/gnome-initial-setup/um-crop-area.c b/gnome-initial-setup/pages/account/um-crop-area.c
similarity index 100%
rename from gnome-initial-setup/um-crop-area.c
rename to gnome-initial-setup/pages/account/um-crop-area.c
diff --git a/gnome-initial-setup/um-crop-area.h b/gnome-initial-setup/pages/account/um-crop-area.h
similarity index 100%
rename from gnome-initial-setup/um-crop-area.h
rename to gnome-initial-setup/pages/account/um-crop-area.h
diff --git a/gnome-initial-setup/um-photo-dialog.c b/gnome-initial-setup/pages/account/um-photo-dialog.c
similarity index 100%
rename from gnome-initial-setup/um-photo-dialog.c
rename to gnome-initial-setup/pages/account/um-photo-dialog.c
diff --git a/gnome-initial-setup/um-photo-dialog.h b/gnome-initial-setup/pages/account/um-photo-dialog.h
similarity index 100%
rename from gnome-initial-setup/um-photo-dialog.h
rename to gnome-initial-setup/pages/account/um-photo-dialog.h
diff --git a/gnome-initial-setup/um-utils.c b/gnome-initial-setup/pages/account/um-utils.c
similarity index 100%
rename from gnome-initial-setup/um-utils.c
rename to gnome-initial-setup/pages/account/um-utils.c
diff --git a/gnome-initial-setup/um-utils.h b/gnome-initial-setup/pages/account/um-utils.h
similarity index 100%
rename from gnome-initial-setup/um-utils.h
rename to gnome-initial-setup/pages/account/um-utils.h
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index b95adb5..d8775a8 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -3,7 +3,7 @@
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">setup.ui</file>
     <file preprocess="xml-stripblanks">gis-language-page.ui</file>
-    <file preprocess="xml-stripblanks">gis-account-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">gis-goa-page.ui</file>