[gnome-initial-setup] Start splitting pages out into subdirectories

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

commit 91b9e937d02f4b041483ff06f53eafffd235967b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jul 12 20:21:16 2012 -0400

    Start splitting pages out into subdirectories
    
    The source directory is getting a little crowded. Let's start by
    moving the network panel into its own subdir.

 configure.ac                                       |    2 ++
 gnome-initial-setup/Makefile.am                    |    9 +++------
 gnome-initial-setup/gnome-initial-setup.c          |    2 +-
 gnome-initial-setup/pages/Makefile.am              |    2 ++
 gnome-initial-setup/pages/network/Makefile.am      |   12 ++++++++++++
 .../{ => pages/network}/gis-network-page.c         |    0
 .../{ => pages/network}/gis-network-page.h         |    0
 .../{ => pages/network}/gis-network-page.ui        |    0
 .../{ => pages/network}/panel-cell-renderer-mode.c |    0
 .../{ => pages/network}/panel-cell-renderer-mode.h |    0
 .../network}/panel-cell-renderer-security.c        |    0
 .../network}/panel-cell-renderer-security.h        |    0
 .../network}/panel-cell-renderer-signal.c          |    0
 .../network}/panel-cell-renderer-signal.h          |    0
 gnome-initial-setup/setup.gresource.xml            |    2 +-
 15 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a48db2a..899c4ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,8 @@ AC_CONFIG_FILES([
 Makefile
 data/Makefile
 gnome-initial-setup/Makefile
+gnome-initial-setup/pages/Makefile
+gnome-initial-setup/pages/network/Makefile
 gnome-initial-setup/languages/Makefile
 po/Makefile.in
 ])
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index 80f1d1b..2bfe979 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = languages
+SUBDIRS = languages pages
 
 uidir = $(datadir)/gnome-initial-setup
 
@@ -29,7 +29,7 @@ BUILT_SOURCES += timedated.c timedated.h
 UI_FILES = \
 	setup.ui \
 	gis-language-page.ui \
-	gis-network-page.ui \
+	pages/network/gis-network-page.ui \
 	gis-account-page.ui \
 	gis-location-page.ui \
 	gis-goa-page.ui \
@@ -54,13 +54,9 @@ gnome_initial_setup_SOURCES =	\
 	gis-eula-pages.c gis-eula-pages.h \
 	gis-location-page.c gis-location-page.h \
 	gis-account-page.c gis-account-page.h \
-	gis-network-page.c gis-network-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 \
-	panel-cell-renderer-signal.c panel-cell-renderer-signal.h \
-	panel-cell-renderer-mode.c panel-cell-renderer-mode.h \
-	panel-cell-renderer-security.c panel-cell-renderer-security.h \
 	cc-timezone-map.c cc-timezone-map.h \
 	$(pw_utils_sources) \
 	um-utils.c um-utils.h \
@@ -70,6 +66,7 @@ gnome_initial_setup_SOURCES =	\
 	$(BUILT_SOURCES)
 
 gnome_initial_setup_LDADD =	\
+	pages/network/libgisnetwork.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 96430a5..0f64da6 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -18,7 +18,7 @@
 #include "gis-eula-pages.h"
 #include "gis-location-page.h"
 #include "gis-account-page.h"
-#include "gis-network-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
new file mode 100644
index 0000000..f4409f4
--- /dev/null
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS = network
diff --git a/gnome-initial-setup/pages/network/Makefile.am b/gnome-initial-setup/pages/network/Makefile.am
new file mode 100644
index 0000000..1a15d33
--- /dev/null
+++ b/gnome-initial-setup/pages/network/Makefile.am
@@ -0,0 +1,12 @@
+
+noinst_LTLIBRARIES = libgisnetwork.la
+
+libgisnetwork_la_SOURCES =	\
+	panel-cell-renderer-signal.c panel-cell-renderer-signal.h \
+	panel-cell-renderer-mode.c panel-cell-renderer-mode.h \
+	panel-cell-renderer-security.c panel-cell-renderer-security.h \
+	gis-network-page.c gis-network-page.h
+
+libgisnetwork_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgisnetwork_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgisnetwork_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
diff --git a/gnome-initial-setup/gis-network-page.c b/gnome-initial-setup/pages/network/gis-network-page.c
similarity index 100%
rename from gnome-initial-setup/gis-network-page.c
rename to gnome-initial-setup/pages/network/gis-network-page.c
diff --git a/gnome-initial-setup/gis-network-page.h b/gnome-initial-setup/pages/network/gis-network-page.h
similarity index 100%
rename from gnome-initial-setup/gis-network-page.h
rename to gnome-initial-setup/pages/network/gis-network-page.h
diff --git a/gnome-initial-setup/gis-network-page.ui b/gnome-initial-setup/pages/network/gis-network-page.ui
similarity index 100%
rename from gnome-initial-setup/gis-network-page.ui
rename to gnome-initial-setup/pages/network/gis-network-page.ui
diff --git a/gnome-initial-setup/panel-cell-renderer-mode.c b/gnome-initial-setup/pages/network/panel-cell-renderer-mode.c
similarity index 100%
rename from gnome-initial-setup/panel-cell-renderer-mode.c
rename to gnome-initial-setup/pages/network/panel-cell-renderer-mode.c
diff --git a/gnome-initial-setup/panel-cell-renderer-mode.h b/gnome-initial-setup/pages/network/panel-cell-renderer-mode.h
similarity index 100%
rename from gnome-initial-setup/panel-cell-renderer-mode.h
rename to gnome-initial-setup/pages/network/panel-cell-renderer-mode.h
diff --git a/gnome-initial-setup/panel-cell-renderer-security.c b/gnome-initial-setup/pages/network/panel-cell-renderer-security.c
similarity index 100%
rename from gnome-initial-setup/panel-cell-renderer-security.c
rename to gnome-initial-setup/pages/network/panel-cell-renderer-security.c
diff --git a/gnome-initial-setup/panel-cell-renderer-security.h b/gnome-initial-setup/pages/network/panel-cell-renderer-security.h
similarity index 100%
rename from gnome-initial-setup/panel-cell-renderer-security.h
rename to gnome-initial-setup/pages/network/panel-cell-renderer-security.h
diff --git a/gnome-initial-setup/panel-cell-renderer-signal.c b/gnome-initial-setup/pages/network/panel-cell-renderer-signal.c
similarity index 100%
rename from gnome-initial-setup/panel-cell-renderer-signal.c
rename to gnome-initial-setup/pages/network/panel-cell-renderer-signal.c
diff --git a/gnome-initial-setup/panel-cell-renderer-signal.h b/gnome-initial-setup/pages/network/panel-cell-renderer-signal.h
similarity index 100%
rename from gnome-initial-setup/panel-cell-renderer-signal.h
rename to gnome-initial-setup/pages/network/panel-cell-renderer-signal.h
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index 07ebb61..3614866 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -3,9 +3,9 @@
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">setup.ui</file>
     <file preprocess="xml-stripblanks">gis-language-page.ui</file>
-    <file preprocess="xml-stripblanks">gis-network-page.ui</file>
     <file preprocess="xml-stripblanks">gis-account-page.ui</file>
     <file preprocess="xml-stripblanks">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">gis-summary-page.ui</file>
   </gresource>