Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

1 files changed, 1112 insertions, 0 deletions

diff --git a/source/l/glib/glib-1.2.10-autotools.patch b/source/l/glib/glib-1.2.10-autotools.patch
new file mode 100644
index 000000000..ebf50abe6
--- /dev/null
+++ b/source/l/glib/glib-1.2.10-autotools.patch
@@ -0,0 +1,1112 @@
+--- Makefile.in
++++ Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -106,24 +106,70 @@ BUILT_SOURCES = stamp-gc-h #note: not gl
+ 
+ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+ 
+-EXTRA_DIST =  	glib.m4				glib.spec.in			acglib.m4			sanity_check			README.win32			glib.def			makefile.msc.in			makefile.msc			giowin32.c			glibconfig.h.win32		glibconfig.h.win32.in		config.h.win32			config.h.win32.in		glib.pc.in 			gmodule.pc.in			gthread.pc.in
++EXTRA_DIST = \
++	glib.m4			\
++	glib.spec.in		\
++	acglib.m4		\
++	sanity_check		\
++	README.win32		\
++	glib.def		\
++	makefile.msc.in		\
++	makefile.msc		\
++	giowin32.c		\
++	glibconfig.h.win32	\
++	glibconfig.h.win32.in	\
++	config.h.win32		\
++	config.h.win32.in	\
++	glib.pc.in 		\
++	gmodule.pc.in		\
++	gthread.pc.in
+ 
+ 
+ lib_LTLIBRARIES = libglib.la
+ 
+-libglib_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
++libglib_la_SOURCES = \
++	garray.c	\
++	gcache.c	\
++	gcompletion.c	\
++	gdataset.c	\
++	gdate.c         \
++	gerror.c	\
++	ghash.c		\
++	ghook.c		\
++	giochannel.c    \
++	giounix.c       \
++	glist.c		\
++	gmain.c         \
++	gmem.c		\
++	gmessages.c	\
++	gmutex.c	\
++	gnode.c		\
++	gprimes.c	\
++	grel.c		\
++	gscanner.c	\
++	gslist.c	\
++	gstrfuncs.c	\
++	gstring.c	\
++	gtimer.c	\
++	gtree.c		\
++	gutils.c
+ 
+ 
+ glibincludedir = $(includedir)/glib-1.2
+-glibinclude_HEADERS =  	glib.h
++glibinclude_HEADERS = \
++	glib.h
+ 
+ 
+-configinclude_DATA =  	glibconfig.h
++configinclude_DATA = \
++	glibconfig.h
+ 
+ 
+ CONFIGURE_DEPENDENCIES = acglib.m4		
+ 
+-libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic
++libglib_la_LDFLAGS = \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-export-dynamic
+ 
+ 
+ noinst_PROGRAMS = testglib testgdate testgdateparser
+@@ -190,6 +236,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
+ 
+ TAR = gtar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/garray.P .deps/gcache.P .deps/gcompletion.P \
++.deps/gdataset.P .deps/gdate.P .deps/gerror.P .deps/ghash.P \
++.deps/ghook.P .deps/giochannel.P .deps/giounix.P .deps/glist.P \
++.deps/gmain.P .deps/gmem.P .deps/gmessages.P .deps/gmutex.P \
++.deps/gnode.P .deps/gprimes.P .deps/grel.P .deps/gscanner.P \
++.deps/gslist.P .deps/gstrfuncs.P .deps/gstring.P .deps/gtimer.P \
++.deps/gtree.P .deps/gutils.P .deps/testgdate.P .deps/testgdateparser.P \
++.deps/testglib.P
+ SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
+ OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
+ 
+@@ -197,9 +251,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -274,9 +328,6 @@ uninstall-libLTLIBRARIES:
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -293,9 +344,6 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -439,7 +487,7 @@ uninstall-glibincludeHEADERS:
+ all-recursive install-data-recursive install-exec-recursive \
+ installdirs-recursive install-recursive uninstall-recursive  \
+ check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -459,11 +507,11 @@ check-recursive installcheck-recursive i
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+ 	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+@@ -553,7 +601,12 @@ dist-all: distdir
+ distdir: $(DISTFILES)
+ 	-rm -rf $(distdir)
+ 	mkdir $(distdir)
+-	-chmod 777 $(distdir)
++	-chmod 755 $(distdir)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -569,41 +622,44 @@ distdir: $(DISTFILES)
+ 	    test -d $(distdir)/$$subdir \
+ 	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
++	    chmod 755 $(distdir)/$$subdir; \
+ 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+ 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+-garray.lo garray.o : garray.c glib.h glibconfig.h
+-gcache.lo gcache.o : gcache.c glib.h glibconfig.h
+-gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h
+-gdataset.lo gdataset.o : gdataset.c glib.h glibconfig.h
+-gdate.lo gdate.o : gdate.c config.h glib.h glibconfig.h
+-gerror.lo gerror.o : gerror.c config.h glib.h glibconfig.h
+-ghash.lo ghash.o : ghash.c glib.h glibconfig.h
+-ghook.lo ghook.o : ghook.c glib.h glibconfig.h
+-giochannel.lo giochannel.o : giochannel.c config.h glib.h glibconfig.h
+-giounix.lo giounix.o : giounix.c glib.h glibconfig.h
+-glist.lo glist.o : glist.c glib.h glibconfig.h
+-gmain.lo gmain.o : gmain.c config.h glib.h glibconfig.h
+-gmem.lo gmem.o : gmem.c config.h glib.h glibconfig.h
+-gmessages.lo gmessages.o : gmessages.c config.h glib.h glibconfig.h
+-gmutex.lo gmutex.o : gmutex.c glib.h glibconfig.h
+-gnode.lo gnode.o : gnode.c glib.h glibconfig.h
+-gprimes.lo gprimes.o : gprimes.c glib.h glibconfig.h
+-grel.lo grel.o : grel.c glib.h glibconfig.h
+-gscanner.lo gscanner.o : gscanner.c config.h glib.h glibconfig.h
+-gslist.lo gslist.o : gslist.c glib.h glibconfig.h
+-gstrfuncs.lo gstrfuncs.o : gstrfuncs.c config.h glib.h glibconfig.h
+-gstring.lo gstring.o : gstring.c glib.h glibconfig.h
+-gtimer.lo gtimer.o : gtimer.c config.h glib.h glibconfig.h
+-gtree.lo gtree.o : gtree.c glib.h glibconfig.h
+-gutils.lo gutils.o : gutils.c config.h glibconfig.h glib.h
+-testgdate.o: testgdate.c glib.h glibconfig.h
+-testgdateparser.o: testgdateparser.c glib.h glibconfig.h
+-testglib.o: testglib.c glib.h glibconfig.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-recursive
+ dvi-am:
+@@ -654,19 +710,20 @@ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
+ 		mostlyclean-compile mostlyclean-libtool \
+ 		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+-		mostlyclean-generic
++		mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-recursive
+ 
+ distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-recursive
+@@ -676,7 +733,8 @@ maintainer-clean-am:  maintainer-clean-h
+ 		maintainer-clean-libLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -701,10 +759,12 @@ uninstall-exec-recursive installdirs-rec
+ all-recursive check-recursive installcheck-recursive info-recursive \
+ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
+-install-exec-am install-exec install-data-am install-data install-am \
+-install uninstall-am uninstall all-redirect all-am all installdirs-am \
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck all-recursive-am install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs-am \
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+--- docs/Makefile.in
++++ docs/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -96,7 +96,9 @@ info_TEXINFOS = glib.texi
+ 
+ man_MANS = glib-config.1
+ 
+-EXTRA_DIST = glib-config.1.in		     glib.html 			     glib_toc.html
++EXTRA_DIST = glib-config.1.in	\
++	     glib.html 		\
++	     glib_toc.html
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -120,9 +122,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -208,7 +210,7 @@ uninstall-info:
+ 	else ii=; fi; \
+ 	list='$(INFO_DEPS)'; \
+ 	for file in $$list; do \
+-	  test -z "$ii" \
++	  test -z "$$ii" \
+ 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
+ 	done
+ 	@$(NORMAL_UNINSTALL)
+@@ -292,6 +294,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = docs
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+--- gmodule/Makefile.in
++++ gmodule/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -92,16 +92,24 @@ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule 	-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
++	-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@
+ 
+ 
+-EXTRA_DIST =  		gmoduleconf.h.in 		gmodule.def			gmodule-dl.c			gmodule-dld.c			gmodule-win32.c			gmoduleconf.h.win32
++EXTRA_DIST = \
++		gmoduleconf.h.in \
++		gmodule.def	\
++		gmodule-dl.c	\
++		gmodule-dld.c	\
++		gmodule-win32.c	\
++		gmoduleconf.h.win32
+ 
+ 
+ BUILT_SOURCES = gmoduleconf.h
+ 
+ glibincludedir = $(includedir)/glib-1.2
+-glibinclude_HEADERS =  		gmodule.h
++glibinclude_HEADERS = \
++		gmodule.h
+ 
+ 
+ libglib = $(top_builddir)/libglib.la # -lglib
+@@ -109,24 +117,30 @@ libglib = $(top_builddir)/libglib.la # -
+ lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
+ 
+ libgmodule_la_SOURCES = gmodule.c
+-libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic
++libgmodule_la_LDFLAGS = \
++	@G_MODULE_LDFLAGS@ \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-no-undefined -Wl,--no-undefined \
++	-export-dynamic
+ 
+ 
+-libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgmodule_la_DEPENDENCIES = $(libglib)
++libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
+ # we should really depend on $(libglib) for libgmodule.la, but libtool has a
+ # problem with this ;(
+ 
+ libgplugin_a_la_SOURCES = libgplugin_a.c
+ libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
+-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
+ 
+ libgplugin_b_la_SOURCES = libgplugin_b.c
+ libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
+-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
+ 
+ noinst_PROGRAMS = testgmodule
+ testgmodule_LDFLAGS =  @G_MODULE_LDFLAGS@
+-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
++testgmodule_LDADD = libgmodule.la @G_MODULE_LIBS@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =  gmoduleconf.h
+@@ -137,17 +151,16 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libgmodule_la_DEPENDENCIES = 
+ libgmodule_la_OBJECTS =  gmodule.lo
+-libgplugin_a_la_DEPENDENCIES = 
++libgplugin_a_la_DEPENDENCIES =  $(top_builddir)/libglib.la
+ libgplugin_a_la_OBJECTS =  libgplugin_a.lo
+-libgplugin_b_la_DEPENDENCIES = 
++libgplugin_b_la_DEPENDENCIES =  $(top_builddir)/libglib.la
+ libgplugin_b_la_OBJECTS =  libgplugin_b.lo
+ PROGRAMS =  $(noinst_PROGRAMS)
+ 
+ testgmodule_SOURCES = testgmodule.c
+ testgmodule_OBJECTS =  testgmodule.o
+-testgmodule_DEPENDENCIES =  libgmodule.la $(top_builddir)/libglib.la
++testgmodule_DEPENDENCIES =  libgmodule.la
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -163,6 +176,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
+ 
+ TAR = gtar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/gmodule.P .deps/libgplugin_a.P .deps/libgplugin_b.P \
++.deps/testgmodule.P
+ SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
+ OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
+ 
+@@ -170,9 +185,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gmodule/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu gmodule/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -194,9 +209,6 @@ uninstall-libLTLIBRARIES:
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -213,9 +225,6 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -303,6 +312,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = gmodule
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gmodule/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -313,15 +327,38 @@ distdir: $(DISTFILES)
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-gmodule.lo gmodule.o : gmodule.c gmodule.h ../glib.h ../glibconfig.h \
+-	gmoduleconf.h gmodule-dl.c
+-libgplugin_a.lo libgplugin_a.o : libgplugin_a.c gmodule.h ../glib.h \
+-	../glibconfig.h
+-libgplugin_b.lo libgplugin_b.o : libgplugin_b.c gmodule.h ../glib.h \
+-	../glibconfig.h
+-testgmodule.o: testgmodule.c gmodule.h ../glib.h ../glibconfig.h \
+-	gmoduleconf.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -361,19 +398,20 @@ maintainer-clean-generic:
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -381,7 +419,8 @@ distclean: distclean-am
+ maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -396,12 +435,13 @@ maintainer-clean-libtool mostlyclean-noi
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS uninstall-glibincludeHEADERS \
+ install-glibincludeHEADERS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ gmoduleconf.h:	gmoduleconf.h.in
+ 
+--- gthread/Makefile.in
++++ gthread/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -94,7 +94,12 @@ VERSION = @VERSION@
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread -DG_LOG_DOMAIN=\"GThread\"
+ 
+-EXTRA_DIST =  		gthread-posix.c				gthread-solaris.c			gthread-nspr.c				gthread-none.c				gthread.def
++EXTRA_DIST = \
++		gthread-posix.c		\
++		gthread-solaris.c	\
++		gthread-nspr.c		\
++		gthread-none.c		\
++		gthread.def
+ 
+ 
+ libglib = $(top_builddir)/libglib.la # -lglib
+@@ -102,13 +107,18 @@ libglib = $(top_builddir)/libglib.la # -
+ lib_LTLIBRARIES = libgthread.la
+ 
+ libgthread_la_SOURCES = gthread.c
+-libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic
++libgthread_la_LDFLAGS = \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-no-undefined -Wl,--no-undefined \
++	-export-dynamic
+ 
+ 
+-libgthread_la_LIBADD = @G_THREAD_LIBS@
++libgthread_la_DEPENDENCIES = $(libglib)
++libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
+ 
+ noinst_PROGRAMS = testgthread
+-testgthread_LDADD = ../libglib.la libgthread.la 
++testgthread_LDADD = libgthread.la 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+@@ -119,13 +129,12 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libgthread_la_DEPENDENCIES = 
+ libgthread_la_OBJECTS =  gthread.lo
+ PROGRAMS =  $(noinst_PROGRAMS)
+ 
+ testgthread_SOURCES = testgthread.c
+ testgthread_OBJECTS =  testgthread.o
+-testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
++testgthread_DEPENDENCIES =  libgthread.la
+ testgthread_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -139,6 +148,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
+ 
+ TAR = gtar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/gthread.P .deps/testgthread.P
+ SOURCES = $(libgthread_la_SOURCES) testgthread.c
+ OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
+ 
+@@ -146,9 +156,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gthread/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu gthread/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -178,9 +188,6 @@ uninstall-libLTLIBRARIES:
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -197,9 +204,6 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -266,6 +270,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = gthread
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gthread/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -276,11 +285,38 @@ distdir: $(DISTFILES)
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-gthread.lo gthread.o : gthread.c ../config.h ../glib.h ../glibconfig.h \
+-	gthread-posix.c
+-testgthread.o: testgthread.c ../config.h ../testglib.c ../glib.h \
+-	../glibconfig.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -319,19 +355,20 @@ distclean-generic:
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -339,7 +376,8 @@ distclean: distclean-am
+ maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -353,12 +391,13 @@ mostlyclean-libtool distclean-libtool cl
+ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- tests/Makefile.in
++++ tests/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -94,10 +94,23 @@ VERSION = @VERSION@
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
+-EXTRA_DIST =  	makefile.msc 	makefile.msc.in
+-
+-
+-TESTS =  	array-test		dirname-test		hash-test		list-test		node-test		relation-test		slist-test		string-test		strfunc-test		tree-test		type-test
++EXTRA_DIST = \
++	makefile.msc \
++	makefile.msc.in
++
++
++TESTS = \
++	array-test	\
++	dirname-test	\
++	hash-test	\
++	list-test	\
++	node-test	\
++	relation-test	\
++	slist-test	\
++	string-test	\
++	strfunc-test	\
++	tree-test	\
++	type-test
+ 
+ 
+ noinst_PROGRAMS = $(TESTS)
+@@ -179,6 +192,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
+ 
+ TAR = gtar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/array-test.P .deps/dirname-test.P .deps/hash-test.P \
++.deps/list-test.P .deps/node-test.P .deps/relation-test.P \
++.deps/slist-test.P .deps/strfunc-test.P .deps/string-test.P \
++.deps/tree-test.P .deps/type-test.P
+ SOURCES = array-test.c dirname-test.c hash-test.c list-test.c node-test.c relation-test.c slist-test.c string-test.c strfunc-test.c tree-test.c type-test.c
+ OBJECTS = array-test.o dirname-test.o hash-test.o list-test.o node-test.o relation-test.o slist-test.o string-test.o strfunc-test.o tree-test.o type-test.o
+ 
+@@ -186,9 +203,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tests/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -202,9 +219,6 @@ distclean-noinstPROGRAMS:
+ 
+ maintainer-clean-noinstPROGRAMS:
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -221,9 +235,6 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -318,6 +329,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = tests
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -328,18 +344,38 @@ distdir: $(DISTFILES)
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-array-test.o: array-test.c ../glib.h ../glibconfig.h
+-dirname-test.o: dirname-test.c ../glib.h ../glibconfig.h
+-hash-test.o: hash-test.c ../config.h ../glib.h ../glibconfig.h
+-list-test.o: list-test.c ../glib.h ../glibconfig.h
+-node-test.o: node-test.c ../config.h ../glib.h ../glibconfig.h
+-relation-test.o: relation-test.c ../glib.h ../glibconfig.h
+-slist-test.o: slist-test.c ../glib.h ../glibconfig.h
+-strfunc-test.o: strfunc-test.c ../glib.h ../glibconfig.h
+-string-test.o: string-test.c ../glib.h ../glibconfig.h
+-tree-test.o: tree-test.c ../glib.h ../glibconfig.h
+-type-test.o: type-test.c ../glib.h ../glibconfig.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ check-TESTS: $(TESTS)
+ 	@failed=0; all=0; \
+ 	srcdir=$(srcdir); export srcdir; \
+@@ -402,27 +438,27 @@ distclean-generic:
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
++		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-noinstPROGRAMS distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
++		distclean-libtool distclean-tags distclean-depend \
++		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
++		maintainer-clean-tags maintainer-clean-depend \
++		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -433,12 +469,14 @@ clean-noinstPROGRAMS maintainer-clean-no
+ mostlyclean-compile distclean-compile clean-compile \
+ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \
+-info-am info dvi-am dvi check check-am installcheck-am installcheck \
+-install-exec-am install-exec install-data-am install-data install-am \
+-install uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distclean-tags clean-tags maintainer-clean-tags distdir \
++mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend check-TESTS info-am info dvi-am dvi check \
++check-am installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
+ 
+ 
+ makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
+--- configure
++++ configure
+@@ -2550,12 +2550,12 @@ else
+ #line 2551 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
++  if (!f) return(1);
+   fprintf(f, "%d\n", sizeof(char));
+-  exit(0);
++  return(0);
+ }
+ EOF
+ if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+@@ -2589,12 +2589,12 @@ else
+ #line 2590 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
++  if (!f) return(1);
+   fprintf(f, "%d\n", sizeof(short));
+-  exit(0);
++  return(0);
+ }
+ EOF
+ if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+@@ -2628,12 +2628,12 @@ else
+ #line 2629 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
++  if (!f) return(1);
+   fprintf(f, "%d\n", sizeof(long));
+-  exit(0);
++  return(0);
+ }
+ EOF
+ if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+@@ -2667,12 +2667,12 @@ else
+ #line 2668 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
++  if (!f) return(1);
+   fprintf(f, "%d\n", sizeof(int));
+-  exit(0);
++  return(0);
+ }
+ EOF
+ if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+@@ -2706,12 +2706,12 @@ else
+ #line 2707 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
++  if (!f) return(1);
+   fprintf(f, "%d\n", sizeof(void *));
+-  exit(0);
++  return(0);
+ }
+ EOF
+ if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+@@ -2745,12 +2745,12 @@ else
+ #line 2746 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
++  if (!f) return(1);
+   fprintf(f, "%d\n", sizeof(long long));
+-  exit(0);
++  return(0);
+ }
+ EOF
+ if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null