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

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

commit 1884b5dea6dc1ee23db71019acf98435f1717aa0
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jul 12 20:29:34 2012 -0400

    location: Move page into subdir

 .gitignore                                         |    4 +-
 configure.ac                                       |    1 +
 gnome-initial-setup/Makefile.am                    |   18 ++----------
 gnome-initial-setup/gnome-initial-setup.c          |    2 +-
 gnome-initial-setup/pages/Makefile.am              |    4 ++-
 gnome-initial-setup/pages/location/Makefile.am     |   29 ++++++++++++++++++++
 .../{ => pages/location}/cc-timezone-map.c         |    0
 .../{ => pages/location}/cc-timezone-map.h         |    0
 .../{ => pages/location}/gis-location-page.c       |    0
 .../{ => pages/location}/gis-location-page.h       |    0
 .../{ => pages/location}/gis-location-page.ui      |    0
 .../{ => pages/location}/timedated1-interface.xml  |    0
 gnome-initial-setup/{ => pages/location}/tz.c      |    0
 gnome-initial-setup/{ => pages/location}/tz.h      |    0
 gnome-initial-setup/setup.gresource.xml            |    2 +-
 15 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bb6108..0fdc5f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,11 +49,11 @@ gnome-initial-setup-*.tar.gz
 gnome-initial-setup-*.tar.bz2
 gnome-initial-setup-*.tar.xz
 
-gnome-initial-setup/timedated.c
-gnome-initial-setup/timedated.h
 gnome-initial-setup/setup_resources.c
 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.desktop
diff --git a/configure.ac b/configure.ac
index 899c4ce..3e14e14 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/location/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 2bfe979..f9ac671 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -9,9 +9,7 @@ uidir = $(datadir)/gnome-initial-setup
 AM_CPPFLAGS = \
 	$(INITIAL_SETUP_CFLAGS) \
 	-DUIDIR="\"$(uidir)\"" \
-	-DGNOMECC_DATA_DIR="\"$(datadir)/gnome-control-center\"" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DDATADIR="\"$(datadir)/gnome-control-center/ui/datetime\""
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 LIBS = $(INITIAL_SETUP_LIBS) -lm
 
@@ -19,19 +17,12 @@ libexec_PROGRAMS = gnome-initial-setup
 
 BUILT_SOURCES =
 
-timedated.c: timedated.h
-timedated.h: $(srcdir)/timedated1-interface.xml
-	gdbus-codegen \
-		--interface-prefix org.freedesktop. \
-		--generate-c-code timedated $<
-BUILT_SOURCES += timedated.c timedated.h
-
 UI_FILES = \
 	setup.ui \
 	gis-language-page.ui \
 	pages/network/gis-network-page.ui \
 	gis-account-page.ui \
-	gis-location-page.ui \
+	pages/location/gis-location-page.ui \
 	gis-goa-page.ui \
 	gis-summary-page.ui
 
@@ -52,28 +43,25 @@ 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-location-page.c gis-location-page.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 \
-	cc-timezone-map.c cc-timezone-map.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 \
-	tz.c tz.h \
 	$(BUILT_SOURCES)
 
 gnome_initial_setup_LDADD =	\
 	pages/network/libgisnetwork.la \
+	pages/location/libgislocation.la \
 	languages/liblanguage.la
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = welcome-tour.desktop
 
 EXTRA_DIST = \
-	timedated1-interface.xml \
 	$(UI_FILES) \
 	setup.gresource.xml \
 	welcome-tour.desktop
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 0f64da6..5f80ad6 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -16,7 +16,7 @@
 
 #include "gis-language-page.h"
 #include "gis-eula-pages.h"
-#include "gis-location-page.h"
+#include "pages/location/gis-location-page.h"
 #include "gis-account-page.h"
 #include "pages/network/gis-network-page.h"
 #include "gis-goa-page.h"
diff --git a/gnome-initial-setup/pages/Makefile.am b/gnome-initial-setup/pages/Makefile.am
index f4409f4..16ce829 100644
--- a/gnome-initial-setup/pages/Makefile.am
+++ b/gnome-initial-setup/pages/Makefile.am
@@ -1,2 +1,4 @@
 
-SUBDIRS = network
+SUBDIRS = \
+	location \
+	network
diff --git a/gnome-initial-setup/pages/location/Makefile.am b/gnome-initial-setup/pages/location/Makefile.am
new file mode 100644
index 0000000..1cc7134
--- /dev/null
+++ b/gnome-initial-setup/pages/location/Makefile.am
@@ -0,0 +1,29 @@
+
+noinst_LTLIBRARIES = libgislocation.la
+
+BUILT_SOURCES =
+
+# XXX -- move to libtimezonemap at some point
+AM_CPPFLAGS = \
+	-DGNOMECC_DATA_DIR="\"$(datadir)/gnome-control-center\"" \
+	-DDATADIR="\"$(datadir)/gnome-control-center/ui/datetime\""
+
+timedated.c: timedated.h
+timedated.h: $(srcdir)/timedated1-interface.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.freedesktop. \
+		--generate-c-code timedated $<
+BUILT_SOURCES += timedated.c timedated.h
+
+libgislocation_la_SOURCES =	\
+	tz.c tz.h \
+	cc-timezone-map.c cc-timezone-map.h \
+	gis-location-page.c gis-location-page.h \
+	$(BUILT_SOURCES)
+
+libgislocation_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "../.."
+libgislocation_la_LIBADD = $(INITIAL_SETUP_LIBS)
+libgislocation_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
+
+EXTRA_DIST = 	\
+	timedated1-interface.xml
diff --git a/gnome-initial-setup/cc-timezone-map.c b/gnome-initial-setup/pages/location/cc-timezone-map.c
similarity index 100%
rename from gnome-initial-setup/cc-timezone-map.c
rename to gnome-initial-setup/pages/location/cc-timezone-map.c
diff --git a/gnome-initial-setup/cc-timezone-map.h b/gnome-initial-setup/pages/location/cc-timezone-map.h
similarity index 100%
rename from gnome-initial-setup/cc-timezone-map.h
rename to gnome-initial-setup/pages/location/cc-timezone-map.h
diff --git a/gnome-initial-setup/gis-location-page.c b/gnome-initial-setup/pages/location/gis-location-page.c
similarity index 100%
rename from gnome-initial-setup/gis-location-page.c
rename to gnome-initial-setup/pages/location/gis-location-page.c
diff --git a/gnome-initial-setup/gis-location-page.h b/gnome-initial-setup/pages/location/gis-location-page.h
similarity index 100%
rename from gnome-initial-setup/gis-location-page.h
rename to gnome-initial-setup/pages/location/gis-location-page.h
diff --git a/gnome-initial-setup/gis-location-page.ui b/gnome-initial-setup/pages/location/gis-location-page.ui
similarity index 100%
rename from gnome-initial-setup/gis-location-page.ui
rename to gnome-initial-setup/pages/location/gis-location-page.ui
diff --git a/gnome-initial-setup/timedated1-interface.xml b/gnome-initial-setup/pages/location/timedated1-interface.xml
similarity index 100%
rename from gnome-initial-setup/timedated1-interface.xml
rename to gnome-initial-setup/pages/location/timedated1-interface.xml
diff --git a/gnome-initial-setup/tz.c b/gnome-initial-setup/pages/location/tz.c
similarity index 100%
rename from gnome-initial-setup/tz.c
rename to gnome-initial-setup/pages/location/tz.c
diff --git a/gnome-initial-setup/tz.h b/gnome-initial-setup/pages/location/tz.h
similarity index 100%
rename from gnome-initial-setup/tz.h
rename to gnome-initial-setup/pages/location/tz.h
diff --git a/gnome-initial-setup/setup.gresource.xml b/gnome-initial-setup/setup.gresource.xml
index 3614866..b95adb5 100644
--- a/gnome-initial-setup/setup.gresource.xml
+++ b/gnome-initial-setup/setup.gresource.xml
@@ -4,7 +4,7 @@
     <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">gis-location-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">gis-summary-page.ui</file>