[gnome-initial-setup] goa: Split out

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

commit 786f1711ca8f29d0226b28514f4850fb19e7f8b5
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jul 12 20:44:30 2012 -0400

    goa: Split out

 configure.ac                                       |    1 +
 gnome-initial-setup/Makefile.am                    |    5 ++---
 gnome-initial-setup/gnome-initial-setup.c          |    2 +-
 gnome-initial-setup/pages/Makefile.am              |    3 ++-
 gnome-initial-setup/pages/goa/Makefile.am          |   10 ++++++++++
 .../goa}/cc-online-accounts-add-account-dialog.c   |    0
 .../goa}/cc-online-accounts-add-account-dialog.h   |    0
 gnome-initial-setup/{ => pages/goa}/gis-goa-page.c |    0
 gnome-initial-setup/{ => pages/goa}/gis-goa-page.h |    0
 .../{ => pages/goa}/gis-goa-page.ui                |    0
 gnome-initial-setup/setup.gresource.xml            |    2 +-
 11 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e507114..f16aee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,7 @@ 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/pages/goa/Makefile
 gnome-initial-setup/languages/Makefile
 po/Makefile.in
 ])
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 3cd67a5..76f2393 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -23,7 +23,7 @@ UI_FILES = \
 	pages/network/gis-network-page.ui \
 	pages/account/gis-account-page.ui \
 	pages/location/gis-location-page.ui \
-	gis-goa-page.ui \
+	pages/goa/gis-goa-page.ui \
 	gis-summary-page.ui
 
 setup_resources.c: setup.gresource.xml $(UI_FILES)
@@ -38,14 +38,13 @@ gnome_initial_setup_SOURCES =	\
 	gis-language-page.c gis-language-page.h \
 	gis-eula-pages.c gis-eula-pages.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 \
 	$(BUILT_SOURCES)
 
 gnome_initial_setup_LDADD =	\
 	pages/network/libgisnetwork.la \
 	pages/location/libgislocation.la \
 	pages/account/libgisaccount.la \
+	pages/goa/libgisgoa.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 057e11f..6422291 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -19,7 +19,7 @@
 #include "pages/location/gis-location-page.h"
 #include "pages/account/gis-account-page.h"
 #include "pages/network/gis-network-page.h"
-#include "gis-goa-page.h"
+#include "pages/goa/gis-goa-page.h"
 #include "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 793fc0b..2f82274 100644
--- a/gnome-initial-setup/pages/Makefile.am
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -2,4 +2,5 @@
 SUBDIRS = \
 	account \
 	location \
-	network
+	network \
+	goa
diff --git a/gnome-initial-setup/pages/goa/Makefile.am b/gnome-initial-setup/pages/goa/Makefile.am
new file mode 100644
index 0000000..c07b3ef
--- /dev/null
+++ b/gnome-initial-setup/pages/goa/Makefile.am
@@ -0,0 +1,10 @@
+
+noinst_LTLIBRARIES = libgisgoa.la
+
+libgisgoa_la_SOURCES =	\
+	cc-online-accounts-add-account-dialog.c cc-online-accounts-add-account-dialog.h \
+	gis-goa-page.c gis-goa-page.h
+
+libgisgoa_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgisgoa_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgisgoa_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/cc-online-accounts-add-account-dialog.c b/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.c
similarity index 100%
rename from gnome-initial-setup/cc-online-accounts-add-account-dialog.c
rename to gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.c
diff --git a/gnome-initial-setup/cc-online-accounts-add-account-dialog.h b/gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.h
similarity index 100%
rename from gnome-initial-setup/cc-online-accounts-add-account-dialog.h
rename to gnome-initial-setup/pages/goa/cc-online-accounts-add-account-dialog.h
diff --git a/gnome-initial-setup/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
similarity index 100%
rename from gnome-initial-setup/gis-goa-page.c
rename to gnome-initial-setup/pages/goa/gis-goa-page.c
diff --git a/gnome-initial-setup/gis-goa-page.h b/gnome-initial-setup/pages/goa/gis-goa-page.h
similarity index 100%
rename from gnome-initial-setup/gis-goa-page.h
rename to gnome-initial-setup/pages/goa/gis-goa-page.h
diff --git a/gnome-initial-setup/gis-goa-page.ui b/gnome-initial-setup/pages/goa/gis-goa-page.ui
similarity index 100%
rename from gnome-initial-setup/gis-goa-page.ui
rename to gnome-initial-setup/pages/goa/gis-goa-page.ui
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index d8775a8..7e6e637 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -6,7 +6,7 @@
     <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>
+    <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>
   </gresource>
 </gresources>