Remove docs/glib-config.1.in.

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

	* docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.

diff --git a/ChangeLog b/ChangeLog
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c5b0755..97eaf91 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
 2001-06-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * docs/Makefile.am, configure.in: Remove docs/glib-config.1.in.
+
        * gthread-2.0-uninstalled.pc.in (Cflags): Add @G_THREAD_CFLAGS@.
 
 2001-06-07  Havoc Pennington  <hp@redhat.com>

diff --git a/configure.in b/configure.in
index 3193727..3bb0427 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2045,7 +2045,6 @@ gobject/Makefile
 gthread/Makefile
 po/Makefile.in
 docs/Makefile
-docs/glib-config.1
 docs/reference/Makefile
 docs/reference/glib/Makefile
 docs/reference/gobject/Makefile

diff --git a/docs/.cvsignore b/docs/.cvsignore
index 20e7d2d..61df8a4 100644 (file)
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -16,4 +16,3 @@ Makefile.in
 *.cps
 *.fns
 *.vrs
-glib-config.1

diff --git a/docs/Makefile.am b/docs/Makefile.am
index af426bf..8a5707d 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,10 +2,6 @@
 
 SUBDIRS = reference
 
-man_MANS = glib-config.1
-
-EXTRA_DIST = glib-config.1.in
-
 files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
          echo $$p; \

diff --git a/docs/glib-config.1.in b/docs/glib-config.1.in
deleted file mode 100644 (file)
index 2abf9fa..0000000
--- a/docs/glib-config.1.in
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH GLIB 1 "16 December 1998" Version @VERSION@
-.SH NAME
-glib-config - script to get information about the installed version of GLib
-.SH SYNOPSIS
-.B  glib-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] [LIBRARIES]
-.SH DESCRIPTION
-.PP
-\fIglib-config\fP is a tool that is used to configure to determine
-the compiler and linker flags that should be used to compile
-and link programs that use \fIGLib\fP. It is also used internally
-to the .m4 macros for GNU autoconf that are included with \fIGLib\fP.
-.
-.SH OPTIONS
-.l
-\fIglib-config\fP accepts the following options:
-.TP 8
-.B  LIBRARIES
-\fIGLib\fP has three libraries 'glib', 'gmodule' and 'gthread'.  If you specify one of
-them, only the appropriate things for that library will be printed.
-.TP 8
-.B  \-\-version
-Print the currently installed version of \fIGLib\fP on the standard output.
-.TP 8
-.B  \-\-libs
-Print the linker flags that are necessary to link a \fIGLib\fP program.
-.TP 8
-.B  \-\-cflags
-Print the compiler flags that are necessary to compile a \fIGLib\fP program.
-.TP 8
-.B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIGLib\fP
-was built with when computing the output for the \-\-cflags and
-\-\-libs options. This option is also used for the exec prefix
-if \-\-exec\-prefix was not specified. This option must be specified
-before any \-\-libs or \-\-cflags options.
-.TP 8
-.B  \-\-exec\-prefix=PREFIX
-If specified, use PREFIX instead of the installation exec prefix that
-\fIGLib\fP was built with when computing the output for the \-\-cflags
-and \-\-libs options.  This option must be specified before any
-\-\-libs or \-\-cflags options.
-.SH SEE ALSO
-.BR gtk-config (1),
-.BR gimp (1),
-.BR gimptool (1)
-.SH COPYRIGHT
-Copyright \(co  1998 Owen Taylor
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.