[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RFA: [guile] Header inclusion update [Error building project using gnust
|
From: |
David Ayers |
|
Subject: |
RFA: [guile] Header inclusion update [Error building project using gnustep-guile] |
|
Date: |
Fri, 04 Apr 2003 19:07:28 +0200 |
|
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.3) Gecko/20030312 |
Hi,
This refernces: (the "Error building project using gnustep-guile"
reported by Stefan Urbank that's not in the archives yet so I can't link
it.. :-) )
OK to commit?
* Library/Makefile.postamble: Added after-all and before-clean
targets to support cleaner header inclusions.
* Library/gg_Object.h: Use #include "" rather than <> for project
headers.
Greg
* Makefile: Added uninstall target.
* Library/Makefile.in: Added uninstall target and fixed typo.
* Documentation/Makefile.in: Added uninstall and uninstall-info
target.
ScriptKit
* Library/Guile.h: Use qualified <gnustep/guile/header.h> path for
inclusions. Use "" rather than <> for local inclusions.
* Library/GuileInterpreter.h: Use "" rather than <> for local
inclusions.
* Library/GuileScript.h: Ditto.
* Library/SKInterpreter.h: Ditto.
* Library/SKScript.h: Ditto.
* Library/GuileSCM.h: Use qualified <gnustep/guile/header.h> path
for inclusions.
Cheers,
Dave
PS: instead of changing the dirctory structure of dev-lib/guile to fit
the necesary inclusion path, I added after-all and before-clean targets
to create a directory and a symbolic link. I hope that's ok. I don't
think it should cause problems on Windows either.
? EOF.make
? autom4te.cache
? guile.patch
? Library/gnustep
? Library/gstep-guile.scm
? Tools/tests.log
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ChangeLog,v
retrieving revision 1.68
diff -u -r1.68 ChangeLog
--- ChangeLog 1 Apr 2003 21:47:19 -0000 1.68
+++ ChangeLog 4 Apr 2003 17:00:12 -0000
@@ -1,3 +1,10 @@
+2003-04-04 David Ayers <d.ayers@inode.at>
+
+ * Library/Makefile.postamble: Added after-all and before-clean
+ targets to support cleaner header inclusions.
+ * Library/gg_Object.h: Use #include "" rather than <> for project
+ headers.
+
2003-04-01 David Ayers <d.ayers@inode.at>
* Library/link_gdl2.m: Include deprecated API.
Index: Greg/ChangeLog
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Greg/ChangeLog,v
retrieving revision 1.42
diff -u -r1.42 ChangeLog
--- Greg/ChangeLog 14 Mar 2003 10:40:24 -0000 1.42
+++ Greg/ChangeLog 4 Apr 2003 17:00:12 -0000
@@ -1,3 +1,10 @@
+2003-04-04 David Ayers <d.ayers@inode.at>
+
+ * Makefile: Added uninstall target.
+ * Library/Makefile.in: Added uninstall target and fixed typo.
+ * Documentation/Makefile.in: Added uninstall and uninstall-info
+ target.
+
Fri Mar 14 10:35:00 2003 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* GREG-VERSION: Bump to 1.5
Index: Greg/Makefile
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Greg/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Greg/Makefile 6 Feb 2002 18:44:37 -0000 1.16
+++ Greg/Makefile 4 Apr 2003 17:00:12 -0000
@@ -1,7 +1,7 @@
#
# Main Makefile for Greg (GNUstep REGrestation testing framework in Guile)
#
-# Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
#
# Written by: Richard Frith-Macdonald <rfm@gnu.org>
# Modified by: Nicola Pero <n.pero@mi.flashnet.it>
@@ -50,6 +50,11 @@
install: all
(cd Library; $(MAKE) install); \
(cd Documentation; $(MAKE) install);
+
+uninstall:
+ (cd Library; $(MAKE) uninstall); \
+ (cd Documentation; $(MAKE) uninstall);
+
#
# The clean and distclean targets have `-' because if `make distclean'
Index: Greg/Documentation/Makefile.in
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/guile/Greg/Documentation/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- Greg/Documentation/Makefile.in 13 Dec 2001 14:23:42 -0000 1.10
+++ Greg/Documentation/Makefile.in 4 Apr 2003 17:00:12 -0000
@@ -1,7 +1,7 @@
#
# Makefile for Greg documentation.
#
-# Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
#
# Written by: Richard Frith-Macdonald <rfm@gnu.org>
# Modified by: Nicola Pero <n.pero@mi.flashnet.it>
@@ -61,6 +61,13 @@
-rm -f $(INSTALL_ROOT_DIR)$(man1dir)/greg.1
-$(INSTALL_DATA) greg.1 $(INSTALL_ROOT_DIR)$(man1dir)/greg.1
-chmod a-x $(INSTALL_ROOT_DIR)$(man1dir)/greg.1
+
+uninstall-info:
+ rm -rf $(INSTALL_ROOT_DIR)$(infodir)/dir
+ rm -rf $(INSTALL_ROOT_DIR)$(infodir)/greg.info
+
+uninstall: uninstall-info
+ rm -rf $(INSTALL_ROOT_DIR)$(man1dir)/greg.1
clean:
rm -f gregdoc.aux gregdoc.cp gregdoc.cps gregdoc.dvi \
Index: Greg/Library/Makefile.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Greg/Library/Makefile.in,v
retrieving revision 1.13
diff -u -r1.13 Makefile.in
--- Greg/Library/Makefile.in 20 Apr 2001 11:46:09 -0000 1.13
+++ Greg/Library/Makefile.in 4 Apr 2003 17:00:12 -0000
@@ -1,7 +1,7 @@
#
# Makefile for Greg Library and control program
#
-# Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2003 Free Software Foundation, Inc.
#
# Written by: Richard Frith-Macdonald <rfm@gnu.org>
# Modifed by: Nicola Pero <n.pero@mi.flashne.it>
@@ -88,9 +88,14 @@
install: $(LIB) create_install_dirs
$(LIBTOOL_INSTALL) \
- $(INSTALL_LIBRARY) $(LIB) $(INSTALL_ROOT_DIR)/$(libdir)/ ; \
+ $(INSTALL_LIBRARY) $(LIB) $(INSTALL_ROOT_DIR)$(libdir)/ ; \
$(INSTALL_DATA) greg.scm $(INSTALL_ROOT_DIR)${GUILE_SCM_PATH}/ ; \
$(INSTALL_SCRIPT) greg $(INSTALL_ROOT_DIR)${bindir}/
+
+uninstall:
+ rm -rf $(INSTALL_ROOT_DIR)$(libdir)/$(LIB)
+ rm -rf $(INSTALL_ROOT_DIR)${GUILE_SCM_PATH}/greg.scm
+ rm -rf $(INSTALL_ROOT_DIR)${bindir}/greg
clean:
rm -rf core *.o *.lo *.la .libs *.log *.dbg
Index: Library/Makefile.postamble
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Library/Makefile.postamble,v
retrieving revision 1.13
diff -u -r1.13 Makefile.postamble
--- Library/Makefile.postamble 16 Mar 2003 07:31:59 -0000 1.13
+++ Library/Makefile.postamble 4 Apr 2003 17:00:12 -0000
@@ -12,7 +12,10 @@
# before-all::
# Things to do after compiling
-# after-all::
+after-all::
+ rm -rf gnustep
+ $(MKDIRS) gnustep
+ $(LN_S) .. gnustep/guile
# Things to do before installing
# before-install::
@@ -63,7 +66,8 @@
# after-uninstall::
# Things to do before cleaning
-# before-clean::
+before-clean::
+ rm -rf gnustep
# Things to do after cleaning
# after-clean::
Index: Library/gg_Object.h
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/Library/gg_Object.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gg_Object.h
--- Library/gg_Object.h 14 Oct 1998 16:21:08 -0000 1.1.1.1
+++ Library/gg_Object.h 4 Apr 2003 17:00:12 -0000
@@ -1,5 +1,5 @@
/* gg_Object.h - interface between guile and old Object stuff
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2003 Free Software Foundation, Inc.
Written by: Richard Frith-Macdonald <richard@brainstorm.co.uk>
Date: September 1998
@@ -25,7 +25,7 @@
#define __gg_Object_h_INCLUDE
#ifndef __gstep_guile_h_INCLUDE
-#include <gstep_guile.h>
+#include "gstep_guile.h"
#endif
#include <objc/Object.h>
Index: ScriptKit/ChangeLog
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/ChangeLog,v
retrieving revision 1.11
diff -u -r1.11 ChangeLog
--- ScriptKit/ChangeLog 8 Jan 2002 04:39:01 -0000 1.11
+++ ScriptKit/ChangeLog 4 Apr 2003 17:00:13 -0000
@@ -1,3 +1,15 @@
+2003-04-04 David Ayers <d.ayers@inode.at>
+
+ * Library/Guile.h: Use qualified <gnustep/guile/header.h> path for
+ inclusions. Use "" rather than <> for local inclusions.
+ * Library/GuileInterpreter.h: Use "" rather than <> for local
+ inclusions.
+ * Library/GuileScript.h: Ditto.
+ * Library/SKInterpreter.h: Ditto.
+ * Library/SKScript.h: Ditto.
+ * Library/GuileSCM.h: Use qualified <gnustep/guile/header.h> path
+ for inclusions.
+
2002-01-07 Adam Fedor <fedor@gnu.org>
* SCRIPT_KIT_VERSION (SCRIPT_KIT_VERSION): 0.3.0
Index: ScriptKit/Library/Guile.h
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/Guile.h,v
retrieving revision 1.3
diff -u -r1.3 Guile.h
--- ScriptKit/Library/Guile.h 6 Apr 2001 16:09:46 -0000 1.3
+++ ScriptKit/Library/Guile.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* Guile.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: David I. Lehn<dlehn@vt.edu>
@@ -27,14 +27,14 @@
#ifndef SK_GUILE_H
#define SK_GUILE_H
-#include <gstep_guile.h>
+#include <gnustep/guile/gstep_guile.h>
-#include <ScriptKit/ScriptKit.h>
-#include <ScriptKit/GuileSCM.h>
-#include <ScriptKit/GuileProcedure.h>
-#include <ScriptKit/GuileInterpreter.h>
-#include <ScriptKit/GuileInvocation.h>
-#include <ScriptKit/GuileScript.h>
+#include "ScriptKit.h"
+#include "GuileSCM.h"
+#include "GuileProcedure.h"
+#include "GuileInterpreter.h"
+#include "GuileInvocation.h"
+#include "GuileScript.h"
#if BUILD_libScriptKit_DLL
# define SK_EXPORT __declspec(dllexport)
Index: ScriptKit/Library/GuileInterpreter.h
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/GuileInterpreter.h,v
retrieving revision 1.1
diff -u -r1.1 GuileInterpreter.h
--- ScriptKit/Library/GuileInterpreter.h 9 Mar 1999 12:02:54 -0000
1.1
+++ ScriptKit/Library/GuileInterpreter.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* GuileInterpreter.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: David I. Lehn<dlehn@vt.edu>
@@ -25,7 +25,7 @@
/* GuileInterpreter.h created by dlehn on Mon 16-Jun-1997 */
#ifndef GUILE_INTERPRETER_H
#define GUILE_INTERPRETER_H
-#include <ScriptKit/Guile.h>
+#include "Guile.h"
@class NSString;
Index: ScriptKit/Library/GuileProcedure.h
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/GuileProcedure.h,v
retrieving revision 1.1
diff -u -r1.1 GuileProcedure.h
--- ScriptKit/Library/GuileProcedure.h 9 Mar 1999 12:02:54 -0000 1.1
+++ ScriptKit/Library/GuileProcedure.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* GuileProcedure.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: Eiichi TAKAMORI<taka@ma1.seikyou.ne.jp>
@@ -32,7 +32,8 @@
#include <Foundation/NSString.h>
#include <Foundation/NSObject.h>
-#include <ScriptKit/GuileSCM.h>
+
+#include "GuileSCM.h"
@class NSArray;
Index: ScriptKit/Library/GuileSCM.h
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/GuileSCM.h,v
retrieving revision 1.1
diff -u -r1.1 GuileSCM.h
--- ScriptKit/Library/GuileSCM.h 9 Mar 1999 12:02:54 -0000 1.1
+++ ScriptKit/Library/GuileSCM.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* GuileSCM.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: David I. Lehn<dlehn@vt.edu>
@@ -25,7 +25,7 @@
#ifndef GUILE_S_C_M_H
#define GUILE_S_C_M_H
-#include <gstep_guile.h>
+#include <gnustep/guile/gstep_guile.h>
#include <Foundation/NSString.h>
#include <Foundation/NSValue.h>
Index: ScriptKit/Library/GuileScript.h
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/GuileScript.h,v
retrieving revision 1.1
diff -u -r1.1 GuileScript.h
--- ScriptKit/Library/GuileScript.h 9 Mar 1999 12:02:54 -0000 1.1
+++ ScriptKit/Library/GuileScript.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* GuileScript.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: David I. Lehn<dlehn@vt.edu>
@@ -25,7 +25,7 @@
#ifndef GUILE_SCRIPT_H
#define GUILE_SCRIPT_H
-#include <ScriptKit/Guile.h>
+#include "Guile.h"
@interface GuileScript : SKScript
{
Index: ScriptKit/Library/SKInterpreter.h
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/SKInterpreter.h,v
retrieving revision 1.2
diff -u -r1.2 SKInterpreter.h
--- ScriptKit/Library/SKInterpreter.h 16 Oct 2000 16:51:42 -0000 1.2
+++ ScriptKit/Library/SKInterpreter.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* SKInterpreter.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: David I. Lehn<dlehn@vt.edu>
@@ -26,7 +26,8 @@
#ifndef S_K_INTERPRETER_H
#define S_K_INTERPRETER_H
-#include <ScriptKit/ScriptKit.h>
+#include "ScriptKit.h"
+
#include <Foundation/NSObject.h>
#include <Foundation/NSDictionary.h>
Index: ScriptKit/Library/SKScript.h
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/guile/ScriptKit/Library/SKScript.h,v
retrieving revision 1.1
diff -u -r1.1 SKScript.h
--- ScriptKit/Library/SKScript.h 9 Mar 1999 12:02:54 -0000 1.1
+++ ScriptKit/Library/SKScript.h 4 Apr 2003 17:00:13 -0000
@@ -1,6 +1,6 @@
/* SKScript.h
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003 Free Software Foundation, Inc.
Copyright (C) 1997, 1998 David I. Lehn
Author: David I. Lehn<dlehn@vt.edu>
@@ -26,7 +26,8 @@
#ifndef S_K_SCRIPT_H
#define S_K_SCRIPT_H
-#include <ScriptKit/SKInterpreter.h>
+#include "SKInterpreter.h"
+
#include <Foundation/NSDictionary.h>
#include <Foundation/NSObject.h>
#include <objc/objc-api.h>