Removed my ulgy splicing hack of glib.h/glibconfig.h. It's back to the

way it was. -Jay

4 files changed, 22 insertions, 44 deletions

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 1179498663..4119b7efa4 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -18,24 +18,13 @@ libglib_la_SOURCES = \
 		gutils.c
 
 include_HEADERS = \
-		glib.h
+		glib.h \
+		glibconfig.h
 
 libglib_la_LDFLAGS = -version-info 1:0:0
 
 INCLUDES = -I$(top_srcdir)
 
-BUILT_SOURCES = glib.h
-
-glib.h: glibconfig.h glib_pre1.h glib_pre2.h
-	$(srcdir)/makeglib_h $(srcdir)/glib_pre1.h \
-	$(top_builddir)/glibconfig.h \
-	$(srcdir)/glib_pre2.h > $@
-
-EXTRA_DIST = \
-		glib_pre1.h \
-		glib_pre2.h \
-		makeglib_h
-
 noinst_PROGRAMS = testglib
 testglib_LDADD = $(top_builddir)/libglib.la
 
@@ -48,5 +37,3 @@ files:
 
 release:
 	$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
-
-$(DEP_FILES) : $(BUILT_SOURCES)
diff --git a/glib/glib_pre2.h b/glib/glib.h
index 308078dc4e..75faa37a41 100644
--- a/glib/glib_pre2.h
+++ b/glib/glib.h
@@ -1,6 +1,24 @@
-/*
- * END AUTOHEADER PATCH-IN
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#ifndef __G_LIB_H__
+#define __G_LIB_H__
+
+#include <glibconfig.h>
 
 #ifdef USE_DMALLOC
 #include "dmalloc.h"
diff --git a/glib/glib_pre1.h b/glib/glib_pre1.h
deleted file mode 100644
index 04d0ed5ed7..0000000000
--- a/glib/glib_pre1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __G_LIB_H__
-#define __G_LIB_H__
-
-/*
- * THIS PORTION PATCHED IN FROM AUTOHEADER
- */
diff --git a/glib/makeglib_h b/glib/makeglib_h
deleted file mode 100755
index f732147cca..0000000000
--- a/glib/makeglib_h
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cat $1
-cat $2
-cat $3