AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
way it was. -Jay
This commit is contained in:
Jay Painter 1998-01-03 04:38:58 +00:00
parent 7a2073bf64
commit 39f02b638b
4 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glib/Makefile.am
View File

@ -18,24 +18,13 @@ libglib_la_SOURCES = \
gutils.c gutils.c
include_HEADERS = \ include_HEADERS = \
glib.h glib.h \
glibconfig.h
libglib_la_LDFLAGS = -version-info 1:0:0 libglib_la_LDFLAGS = -version-info 1:0:0
INCLUDES = -I$(top_srcdir) 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 noinst_PROGRAMS = testglib
testglib_LDADD = $(top_builddir)/libglib.la testglib_LDADD = $(top_builddir)/libglib.la
@ -48,5 +37,3 @@ files:
release: release:
$(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"` $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
$(DEP_FILES) : $(BUILT_SOURCES)

22
glib/glib_pre2.h → glib/glib.h
View File

@ -1,6 +1,24 @@
/* /* GLIB - Library of useful routines for C programming
* END AUTOHEADER PATCH-IN * 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 #ifdef USE_DMALLOC
#include "dmalloc.h" #include "dmalloc.h"

23
glib/glib_pre1.h
View File

@ -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
*/

4
glib/makeglib_h
View File

@ -1,4 +0,0 @@
#!/bin/sh
cat $1
cat $2
cat $3