glib2: Build only glib

We only need the base library for pkg-config.

4 files changed, 5 insertions, 67 deletions

diff --git a/glib2/Makefile.am b/glib2/Makefile.am
index 91af7be..9361594 100644
--- a/glib2/Makefile.am
+++ b/glib2/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . m4macros glib gmodule gthread gobject gio
+SUBDIRS = . m4macros glib
 DIST_SUBDIRS = $(SUBDIRS) build
 
 AM_CPPFLAGS = 					\
@@ -43,20 +43,7 @@ EXTRA_DIST += 			\
 	msvc_recommended_pragmas.h \
 	config.h.win32.in	\
 	glib-2.0.pc.in 		\
-	gobject-2.0.pc.in 	\
-	gmodule-2.0.pc.in	\
-	gmodule-export-2.0.pc.in	\
-	gmodule-no-export-2.0.pc.in	\
-	gthread-2.0.pc.in	\
-	gio-2.0.pc.in		\
-	gio-unix-2.0.pc.in	\
-	glib-2.0-uninstalled.pc.in 	\
-	gobject-2.0-uninstalled.pc.in 	\
-	gmodule-2.0-uninstalled.pc.in	\
-	gthread-2.0-uninstalled.pc.in	\
-	gmodule-no-export-2.0-uninstalled.pc.in \
-	gio-2.0-uninstalled.pc.in		\
-	gio-unix-2.0-uninstalled.pc.in
+	glib-2.0-uninstalled.pc.in
 
 
 # These may be in the builddir too
@@ -98,11 +85,7 @@ ChangeLog:
 	fi
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc
-
-if OS_UNIX
-pkgconfig_DATA += gio-unix-2.0.pc
-endif
+pkgconfig_DATA = glib-2.0.pc
 
 $(pkgconfig_DATA): config.status
 
diff --git a/glib2/build/win32/vs8/Makefile.am b/glib2/build/win32/vs8/Makefile.am
index 69cd83f..6d43bb9 100644
--- a/glib2/build/win32/vs8/Makefile.am
+++ b/glib2/build/win32/vs8/Makefile.am
@@ -1,11 +1,7 @@
 EXTRA_DIST = \
 	README \
-	gio.vcproj \
 	glib-genmarshal.vcproj \
 	glib.sln \
 	glib.vcproj \
-	gmodule.vcproj \
-	gobject.vcproj \
 	gspawn-win32-helper-console.vcproj \
-	gspawn-win32-helper.vcproj \
-	gthread.vcproj
+	gspawn-win32-helper.vcproj
diff --git a/glib2/build/win32/vs9/Makefile.am b/glib2/build/win32/vs9/Makefile.am
index e9b379f..6426653 100644
--- a/glib2/build/win32/vs9/Makefile.am
+++ b/glib2/build/win32/vs9/Makefile.am
@@ -7,11 +7,5 @@ EXTRA_DIST = \
 	glib-genmarshal.vcproj \
 	gspawn-win32-helper-console.vcproj \
 	gspawn-win32-helper.vcproj \
-	gmodule.vcproj \
-	gobject.vcproj \
-	gobject.vcprojin \
-	gthread.vcproj \
-	gio.vcproj \
-	gio.vcprojin \
 	testglib.vcproj \
 	install.vcproj
diff --git a/glib2/configure.in b/glib2/configure.in
index 40db0c2..a35efcf 100644
--- a/glib2/configure.in
+++ b/glib2/configure.in
@@ -3469,19 +3469,6 @@ fi
 AC_CONFIG_FILES([
 glib-2.0.pc
 glib-2.0-uninstalled.pc
-gmodule-2.0.pc
-gmodule-export-2.0.pc
-gmodule-no-export-2.0.pc
-gmodule-2.0-uninstalled.pc
-gmodule-no-export-2.0-uninstalled.pc
-gthread-2.0.pc
-gthread-2.0-uninstalled.pc
-gobject-2.0.pc
-gobject-2.0-uninstalled.pc
-gio-2.0.pc
-gio-unix-2.0.pc
-gio-2.0-uninstalled.pc
-gio-unix-2.0-uninstalled.pc
 glib-zip
 Makefile
 build/Makefile
@@ -3493,27 +3480,12 @@ glib/libcharset/Makefile
 glib/gnulib/Makefile
 glib/pcre/Makefile
 glib/update-pcre/Makefile
-gmodule/Makefile
-gmodule/gmoduleconf.h
-gobject/Makefile
-gobject/glib-mkenums
-gobject/tests/Makefile
-gthread/Makefile
-gthread/tests/Makefile
-gio/Makefile
-gio/xdgmime/Makefile
-gio/inotify/Makefile
-gio/libasyncns/Makefile
-gio/fen/Makefile
-gio/fam/Makefile
-gio/win32/Makefile
-gio/tests/Makefile
 m4macros/Makefile
 ])
 
 AC_CONFIG_COMMANDS([chmod-scripts],
 [chmod 0755 glib-zip
-chmod 0755 gobject/glib-mkenums])
+])
 
 # we want to invoke this macro solely so that the config.status script
 # and automake generated makefiles know about these generated files.
@@ -3526,13 +3498,6 @@ if false; then
     glibconfig.h.win32
     glib/makefile.msc
     glib/glib.rc
-    gmodule/makefile.msc
-    gmodule/gmodule.rc
-    gobject/makefile.msc
-    gobject/gobject.rc
-    gthread/makefile.msc
-    gthread/gthread.rc
-    gio/gio.rc
   ])
 fi