summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2007-04-15 11:44:41 +0000
committerTor Lillqvist <tml@src.gnome.org>2007-04-15 11:44:41 +0000
commit420262f515d72701229b6cae1fdac952e2919aa0 (patch)
tree6c5a137af03c4f62835976e36f7f17a66f8fc359
parenta227b85b73df5b8732a7fd300cb7a35e1a191b9f (diff)
downloadglib-420262f515d72701229b6cae1fdac952e2919aa0.tar.gz
Makefile.am Add the references to build back.
2007-04-15 Tor Lillqvist <tml@novell.com> * Makefile.am * configure: Add the references to build back. svn path=/trunk/; revision=5451
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am2
-rw-r--r--configure.in4
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 009c1be66..ba7b558cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* build: Include the build module using the svn:externals
mechanism.
+ * Makefile.am
+ * configure: Add the references to build back.
+
2007-04-11 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c (g_spawn_async): Fix a doc typo. (#427285,
diff --git a/Makefile.am b/Makefile.am
index 408dce4cc..a0160d630 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.7
-SUBDIRS = . m4macros glib gobject gmodule gthread tests po docs
+SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
bin_SCRIPTS = glib-gettextize
diff --git a/configure.in b/configure.in
index edf2f6c9a..3de062ca6 100644
--- a/configure.in
+++ b/configure.in
@@ -2929,6 +2929,10 @@ gobject-2.0-uninstalled.pc
glib-zip
glib-gettextize
Makefile
+build/Makefile
+build/win32/Makefile
+build/win32/dirent/Makefile
+build/win32/vs8/Makefile
glib/Makefile
glib/libcharset/Makefile
glib/gnulib/Makefile