move the static bits internal to gi and refactor build files

* the glib module now becomes the gi._glib module
* the gobject module now becomes the gi._gobject module
* we do this so we can install in parallel with PyGObject 2

https://bugzilla.gnome.org/show_bug.cgi?id=642048

50 files changed, 15 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 340d0e7c..3b8b6fe2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = docs glib gobject examples gi tests
+SUBDIRS = docs examples gi tests
 
 PLATFORM_VERSION = 3.0
 
diff --git a/configure.ac b/configure.ac
index 3f19ead1..d6832c30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT(pygobject, pygobject_version,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I .")
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([gobject/gobjectmodule.c])
+AC_CONFIG_SRCDIR([gi/gimodule.c])
 
 AC_DEFINE(PYGOBJECT_MAJOR_VERSION, pygobject_major_version, [pygobject major version])
 AC_SUBST(PYGOBJECT_MAJOR_VERSION, pygobject_major_version)
@@ -261,8 +261,8 @@ AC_CONFIG_FILES(
   gi/Makefile
   gi/repository/Makefile
   gi/overrides/Makefile
-  glib/Makefile
-  gobject/Makefile
+  gi/_glib/Makefile
+  gi/_gobject/Makefile
   examples/Makefile
   tests/Makefile
   PKG-INFO)
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 5598c0ad..71f0b650 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -5,9 +5,11 @@ pkgpyexecdir = $(pyexecdir)
 
 SUBDIRS = \
 	repository \
-	overrides
+	overrides \
+        _glib \
+	_gobject
 
-INCLUDES = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib
+INCLUDES = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib
 
 pygidir = $(pkgpyexecdir)/gi
 pygi_PYTHON = \
@@ -25,7 +27,7 @@ _gi_la_LDFLAGS = \
 	-export-symbols-regex "init_gi|PyInit__gi"
 _gi_la_LIBADD = \
 	$(GI_LIBS) \
-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+	$(top_builddir)/gi/_glib/libpyglib-2.0-@PYTHON_BASENAME@.la
 _gi_la_SOURCES = \
 	pygi-repository.c \
 	pygi-repository.h \
diff --git a/glib/Makefile.am b/gi/_glib/Makefile.am
index ed2602a3..5651d69b 100644
--- a/glib/Makefile.am
+++ b/gi/_glib/Makefile.am
@@ -1,14 +1,11 @@
 AUTOMAKE_OPTIONS = 1.7
 INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
 
-pkgincludedir = $(includedir)/pygtk-2.0
-pkginclude_HEADERS = pyglib.h
-
 lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
 
 pkgpyexecdir = $(pyexecdir)
 
-pyglibdir = $(pkgpyexecdir)/glib
+pyglibdir = $(pkgpyexecdir)/gi/_glib
 pyglib_PYTHON = 	\
 	__init__.py	\
 	option.py
diff --git a/glib/__init__.py b/gi/_glib/__init__.py
index b114cb99..b114cb99 100644
--- a/glib/__init__.py
+++ b/gi/_glib/__init__.py
diff --git a/glib/glibmodule.c b/gi/_glib/glibmodule.c
index 963e5ea9..963e5ea9 100644
--- a/glib/glibmodule.c
+++ b/gi/_glib/glibmodule.c
diff --git a/glib/option.py b/gi/_glib/option.py
index bdfbe1d3..bdfbe1d3 100644
--- a/glib/option.py
+++ b/gi/_glib/option.py
diff --git a/glib/pygiochannel.c b/gi/_glib/pygiochannel.c
index f7e2bc4b..f7e2bc4b 100644
--- a/glib/pygiochannel.c
+++ b/gi/_glib/pygiochannel.c
diff --git a/glib/pygiochannel.h b/gi/_glib/pygiochannel.h
index 9b03edd8..9b03edd8 100644
--- a/glib/pygiochannel.h
+++ b/gi/_glib/pygiochannel.h
diff --git a/glib/pyglib-private.h b/gi/_glib/pyglib-private.h
index 183184f3..183184f3 100644
--- a/glib/pyglib-private.h
+++ b/gi/_glib/pyglib-private.h
diff --git a/glib/pyglib-python-compat.h b/gi/_glib/pyglib-python-compat.h
index 8c1dd51a..8c1dd51a 100644
--- a/glib/pyglib-python-compat.h
+++ b/gi/_glib/pyglib-python-compat.h
diff --git a/glib/pyglib.c b/gi/_glib/pyglib.c
index 1e024c2f..1e024c2f 100644
--- a/glib/pyglib.c
+++ b/gi/_glib/pyglib.c
diff --git a/glib/pyglib.h b/gi/_glib/pyglib.h
index 44ead477..44ead477 100644
--- a/glib/pyglib.h
+++ b/gi/_glib/pyglib.h
diff --git a/glib/pygmaincontext.c b/gi/_glib/pygmaincontext.c
index cfb7ddd0..cfb7ddd0 100644
--- a/glib/pygmaincontext.c
+++ b/gi/_glib/pygmaincontext.c
diff --git a/glib/pygmaincontext.h b/gi/_glib/pygmaincontext.h
index 4ffa3c90..4ffa3c90 100644
--- a/glib/pygmaincontext.h
+++ b/gi/_glib/pygmaincontext.h
diff --git a/glib/pygmainloop.c b/gi/_glib/pygmainloop.c
index 219b6a38..219b6a38 100644
--- a/glib/pygmainloop.c
+++ b/gi/_glib/pygmainloop.c
diff --git a/glib/pygmainloop.h b/gi/_glib/pygmainloop.h
index dec82d84..dec82d84 100644
--- a/glib/pygmainloop.h
+++ b/gi/_glib/pygmainloop.h
diff --git a/glib/pygoptioncontext.c b/gi/_glib/pygoptioncontext.c
index 444625ca..444625ca 100644
--- a/glib/pygoptioncontext.c
+++ b/gi/_glib/pygoptioncontext.c
diff --git a/glib/pygoptioncontext.h b/gi/_glib/pygoptioncontext.h
index efe5ffa1..efe5ffa1 100644
--- a/glib/pygoptioncontext.h
+++ b/gi/_glib/pygoptioncontext.h
diff --git a/glib/pygoptiongroup.c b/gi/_glib/pygoptiongroup.c
index 2a693549..2a693549 100644
--- a/glib/pygoptiongroup.c
+++ b/gi/_glib/pygoptiongroup.c
diff --git a/glib/pygoptiongroup.h b/gi/_glib/pygoptiongroup.h
index 872b9c68..872b9c68 100644
--- a/glib/pygoptiongroup.h
+++ b/gi/_glib/pygoptiongroup.h
diff --git a/glib/pygsource.c b/gi/_glib/pygsource.c
index d0176abc..d0176abc 100644
--- a/glib/pygsource.c
+++ b/gi/_glib/pygsource.c
diff --git a/glib/pygsource.h b/gi/_glib/pygsource.h
index bf2c673f..bf2c673f 100644
--- a/glib/pygsource.h
+++ b/gi/_glib/pygsource.h
diff --git a/glib/pygspawn.c b/gi/_glib/pygspawn.c
index 75e2232b..75e2232b 100644
--- a/glib/pygspawn.c
+++ b/gi/_glib/pygspawn.c
diff --git a/glib/pygspawn.h b/gi/_glib/pygspawn.h
index 2e8dd3cf..2e8dd3cf 100644
--- a/glib/pygspawn.h
+++ b/gi/_glib/pygspawn.h
diff --git a/gobject/Makefile.am b/gi/_gobject/Makefile.am
index 0ff704ae..ddeaa171 100644
--- a/gobject/Makefile.am
+++ b/gi/_gobject/Makefile.am
@@ -1,13 +1,10 @@
 AUTOMAKE_OPTIONS = 1.7
 PLATFORM_VERSION = 2.0
 
-pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
-pkginclude_HEADERS = pygobject.h
-
 pkgpyexecdir = $(pyexecdir)
 
 # gobject python scripts
-pygobjectdir = $(pkgpyexecdir)/gobject
+pygobjectdir = $(pkgpyexecdir)/gi/_gobject
 pygobject_PYTHON = 	\
 	__init__.py 	\
 	constants.py	\
@@ -20,7 +17,7 @@ common_ldflags += -no-undefined
 endif
 
 _gobject_la_CFLAGS = \
-	-I$(top_srcdir)/glib \
+	-I$(top_srcdir)/gi/_glib \
 	-I$(top_srcdir)/gi \
 	$(PYTHON_INCLUDES) \
 	$(FFI_CFLAGS) \
@@ -33,7 +30,8 @@ _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(FFI_LIBS) \
 	$(PYTHON_LIBS) \
-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+	$(top_builddir)/gi/_glib/libpyglib-2.0-@PYTHON_BASENAME@.la
+
 _gobject_la_SOURCES =           \
         gobjectmodule.c         \
         pygboxed.c              \
diff --git a/gobject/__init__.py b/gi/_gobject/__init__.py
index 1858d188..1858d188 100644
--- a/gobject/__init__.py
+++ b/gi/_gobject/__init__.py
diff --git a/gobject/constants.py b/gi/_gobject/constants.py
index a6d3ce92..a6d3ce92 100644
--- a/gobject/constants.py
+++ b/gi/_gobject/constants.py
diff --git a/gobject/ffi-marshaller.c b/gi/_gobject/ffi-marshaller.c
index 60cfc34e..60cfc34e 100644
--- a/gobject/ffi-marshaller.c
+++ b/gi/_gobject/ffi-marshaller.c
diff --git a/gobject/ffi-marshaller.h b/gi/_gobject/ffi-marshaller.h
index aac18bd9..aac18bd9 100644
--- a/gobject/ffi-marshaller.h
+++ b/gi/_gobject/ffi-marshaller.h
diff --git a/gobject/gobjectmodule.c b/gi/_gobject/gobjectmodule.c
index 65ae7303..65ae7303 100644
--- a/gobject/gobjectmodule.c
+++ b/gi/_gobject/gobjectmodule.c
diff --git a/gobject/propertyhelper.py b/gi/_gobject/propertyhelper.py
index b9b587ab..b9b587ab 100644
--- a/gobject/propertyhelper.py
+++ b/gi/_gobject/propertyhelper.py
diff --git a/gobject/pygboxed.c b/gi/_gobject/pygboxed.c
index a00386bc..a00386bc 100644
--- a/gobject/pygboxed.c
+++ b/gi/_gobject/pygboxed.c
diff --git a/gobject/pygboxed.h b/gi/_gobject/pygboxed.h
index 8433b9de..8433b9de 100644
--- a/gobject/pygboxed.h
+++ b/gi/_gobject/pygboxed.h
diff --git a/gobject/pygenum.c b/gi/_gobject/pygenum.c
index c0a51a99..c0a51a99 100644
--- a/gobject/pygenum.c
+++ b/gi/_gobject/pygenum.c
diff --git a/gobject/pygenum.h b/gi/_gobject/pygenum.h
index 05588312..05588312 100644
--- a/gobject/pygenum.h
+++ b/gi/_gobject/pygenum.h
diff --git a/gobject/pygflags.c b/gi/_gobject/pygflags.c
index 8c00f150..8c00f150 100644
--- a/gobject/pygflags.c
+++ b/gi/_gobject/pygflags.c
diff --git a/gobject/pygflags.h b/gi/_gobject/pygflags.h
index e93265cd..e93265cd 100644
--- a/gobject/pygflags.h
+++ b/gi/_gobject/pygflags.h
diff --git a/gobject/pyginterface.c b/gi/_gobject/pyginterface.c
index 29af546d..29af546d 100644
--- a/gobject/pyginterface.c
+++ b/gi/_gobject/pyginterface.c
diff --git a/gobject/pyginterface.h b/gi/_gobject/pyginterface.h
index 0f390c28..0f390c28 100644
--- a/gobject/pyginterface.h
+++ b/gi/_gobject/pyginterface.h
diff --git a/gobject/pygobject-private.h b/gi/_gobject/pygobject-private.h
index 99c1894c..99c1894c 100644
--- a/gobject/pygobject-private.h
+++ b/gi/_gobject/pygobject-private.h
diff --git a/gobject/pygobject.c b/gi/_gobject/pygobject.c
index 31938903..31938903 100644
--- a/gobject/pygobject.c
+++ b/gi/_gobject/pygobject.c
diff --git a/gobject/pygobject.h b/gi/_gobject/pygobject.h
index 21743bab..21743bab 100644
--- a/gobject/pygobject.h
+++ b/gi/_gobject/pygobject.h
diff --git a/gobject/pygparamspec.c b/gi/_gobject/pygparamspec.c
index 77436291..77436291 100644
--- a/gobject/pygparamspec.c
+++ b/gi/_gobject/pygparamspec.c
diff --git a/gobject/pygparamspec.h b/gi/_gobject/pygparamspec.h
index 64aab0ce..64aab0ce 100644
--- a/gobject/pygparamspec.h
+++ b/gi/_gobject/pygparamspec.h
diff --git a/gobject/pygpointer.c b/gi/_gobject/pygpointer.c
index 575c7511..575c7511 100644
--- a/gobject/pygpointer.c
+++ b/gi/_gobject/pygpointer.c
diff --git a/gobject/pygpointer.h b/gi/_gobject/pygpointer.h
index f2923daa..f2923daa 100644
--- a/gobject/pygpointer.h
+++ b/gi/_gobject/pygpointer.h
diff --git a/gobject/pygtype.c b/gi/_gobject/pygtype.c
index ffd99a55..ffd99a55 100644
--- a/gobject/pygtype.c
+++ b/gi/_gobject/pygtype.c
diff --git a/gobject/pygtype.h b/gi/_gobject/pygtype.h
index 2f9e7add..2f9e7add 100644
--- a/gobject/pygtype.h
+++ b/gi/_gobject/pygtype.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa84910f..4ec64773 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,7 +45,7 @@ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIM
 
 noinst_LTLIBRARIES += testhelper.la
 
-testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+testhelper_la_CFLAGS = -I$(top_srcdir)/gi/_gobject -I$(top_srcdir)/gi/_glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
 testhelper_la_LDFLAGS = -module -avoid-version
 testhelper_la_LIBADD = $(GLIB_LIBS)
 testhelper_la_SOURCES = \