Removed glib-config-2.0, as we have pkg-config now.

2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* Makefile.am, configure.in: Removed glib-config-2.0, as we have
	pkg-config now.

	* glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.

	* Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.

diff --git a/ChangeLog b/ChangeLog
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f243e77..1f2491e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2001-06-27  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, configure.in: Removed glib-config-2.0, as we have
+       pkg-config now.
+
+       * glib/Makefile.am: Added -I$(top_srcdir) for builddir != srcdir.
+
+       * Makefile.am: Removed gen-unicode-tables.pl from EXTRA_DIST.
+
 Tue Jun 26 11:43:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in Makefile.am *.[ch] glib/*.[ch] glib/Makefile.am:

diff --git a/Makefile.am b/Makefile.am
index 932b479..62f72ef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,7 @@ EXTRA_DIST =                  \
        glib-2.0-uninstalled.pc.in      \
        gobject-2.0-uninstalled.pc.in   \
        gmodule-2.0-uninstalled.pc.in   \
-       gthread-2.0-uninstalled.pc.in   \
-       gen-unicode-tables.pl
+       gthread-2.0-uninstalled.pc.in
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST =             \
@@ -79,10 +78,6 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-bin_SCRIPTS=glib-config-2.0
-BUILT_SOURCES=glib-config-2.0
-glib-config-2.0: glib-config-2.0.in
-
 .PHONY: files release sanity snapshot
 
 files:

diff --git a/configure.in b/configure.in
index fc31571..d064e98 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2034,7 +2034,6 @@ gthread-2.0.pc
 gthread-2.0-uninstalled.pc
 gobject-2.0.pc
 gobject-2.0-uninstalled.pc
-glib-config-2.0
 glib.spec
 Makefile
 build/Makefile
@@ -2051,10 +2050,7 @@ docs/reference/glib/Makefile
 docs/reference/gobject/Makefile
 tests/Makefile
 m4macros/Makefile
-],[case "$CONFIG_FILES" in
-*glib-config-2.0*)chmod +x glib-config-2.0;;
-esac
-echo ""
+],[echo ""
 echo " *** IMPORTANT *** "
 echo ""
 echo "This is a development version of GLib.  You should be using a stable"

diff --git a/glib-config-2.0.in b/glib-config-2.0.in
deleted file mode 100644 (file)
index bf5f5a9..0000000
--- a/glib-config-2.0.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo glib-config-2.0 is no longer supported. Please use pkg-config instead 2>&1
-exit 1

diff --git a/glib/Makefile.am b/glib/Makefile.am
index c255900..be5ff11 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-       -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=g_log_domain_glib \
+       @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
 
 EXTRA_DIST =                   \
        gen-unicode-tables.pl