diff --git a/ChangeLog b/ChangeLog index a8fbd0000..951725e2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a8fbd0000..951725e2b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-01-03 Havoc Pennington + + * tests/Makefile.am (INCLUDES): -I$(top_srcdir)/gmodule, + fix from Michael Meeks + + * Makefile.am (INCLUDES): DISABLE was spelled wrong + Wed Jan 3 14:10:49 2001 Owen Taylor * gmain.[ch]: Switch GMainLoop to be ref/unref, use to diff --git a/Makefile.am b/Makefile.am index d8e0068da..1c1201b54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ BUILT_SOURCES=glib-config-2.0 glib-config-2.0: glib-config-2.0.in INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \ - -DG_DISBALE_COMPAT_H + -DG_DISABLE_COMPAT_H EXTRA_DIST = \ ChangeLog.pre-1-2 \ diff --git a/glib/Makefile.am b/glib/Makefile.am index d8e0068da..1c1201b54 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -9,7 +9,7 @@ BUILT_SOURCES=glib-config-2.0 glib-config-2.0: glib-config-2.0.in INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \ - -DG_DISBALE_COMPAT_H + -DG_DISABLE_COMPAT_H EXTRA_DIST = \ ChangeLog.pre-1-2 \ diff --git a/tests/Makefile.am b/tests/Makefile.am index f96efba59..756e1b789 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@ +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@ EFENCE=