From d6dde8b6ee55d893a6a1f5ac2392ded90a51953b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 3 Apr 2002 17:58:23 +0000 Subject: [PATCH] r1735: *** empty log message *** --- interfaces/clsql-uffi/Makefile | 11 +++++------ interfaces/mysql/Makefile | 12 +++++------- sql/usql.cl | 6 +++--- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/interfaces/clsql-uffi/Makefile b/interfaces/clsql-uffi/Makefile index 9c47421..dae44e9 100644 --- a/interfaces/clsql-uffi/Makefile +++ b/interfaces/clsql-uffi/Makefile @@ -7,7 +7,7 @@ # Programer: Kevin M. Rosenberg # Date Started: Mar 2002 # -# CVS Id: $Id: Makefile,v 1.4 2002/04/03 04:06:05 kevin Exp $ +# CVS Id: $Id: Makefile,v 1.5 2002/04/03 17:58:22 kevin Exp $ # # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg # @@ -20,15 +20,14 @@ # These variables are correct for GCC CC=gcc SHARED_CC_OPT=-fPIC -DPIC - -#SHARED_LD_OPT=-r # For FreeBSD and Solaris (CMUCL) -SHARED_LD_OPT=-Bshareable -Bdynamic # For Linux (ALL) and FreeBSD (ACL) +SHARED_LD_OPT=-shared # For Linux (ALL) and FreeBSD (ACL) +LD=gcc # Use these for Sun's C compiler and Solaris (ACL) #CC=cc #SHARED_CC_OPT=-KPIC #SHARED_LD_OPT=-G - +#LD=ld # Nothing to configure beyond this point @@ -41,7 +40,7 @@ all: $(shared_lib) $(shared_lib): $(source) Makefile $(CC) ${SHARED_CC_OPT} -c $(source) -o $(object) - ld ${SHARED_LD_OPT} $(object) -o $(shared_lib) + $(LD) ${SHARED_LD_OPT} $(object) -o $(shared_lib) rm $(object) clean: diff --git a/interfaces/mysql/Makefile b/interfaces/mysql/Makefile index c674ebb..17099e5 100644 --- a/interfaces/mysql/Makefile +++ b/interfaces/mysql/Makefile @@ -7,7 +7,7 @@ # Programer: Kevin M. Rosenberg # Date Started: Mar 2002 # -# CVS Id: $Id: Makefile,v 1.5 2002/04/03 04:54:17 kevin Exp $ +# CVS Id: $Id: Makefile,v 1.6 2002/04/03 17:58:23 kevin Exp $ # # This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg # @@ -16,19 +16,17 @@ # (http://opensource.franz.com/preamble.html), also known as the LLGPL. ########################################################################### - # These variables are correct for GCC CC=gcc SHARED_CC_OPT=-fPIC -DPIC - -#SHARED_LD_OPT=-r -Bdynamic -whole-archive # For FreeBSD and Solaris (CMUCL) -SHARED_LD_OPT=-Bshareable -Bdynamic # For Linux (ALL) and FreeBSD (ACL) +SHARED_LD_OPT=-shared +LD=gcc # Use these for Sun's C compiler and Solaris (ACL) #CC=cc #SHARED_CC_OPT=-KPIC #SHARED_LD_OPT=-G - +#LD=ld # Set to the directory where you have installed mysql's library MYSQL_DIR=/opt/mysql @@ -50,7 +48,7 @@ all: $(shared_lib) $(shared_lib): $(source) Makefile $(MYSQL_LIB_FILE) $(CC) ${SHARED_CC_OPT} -I $(MYSQL_INCLUDE) -c $(source) -o $(object) - ld ${SHARED_LD_OPT} $(object) $(MYSQL_LIB_FILE) -o $(shared_lib) + $(LD) ${SHARED_LD_OPT} $(object) $(MYSQL_LIB_FILE) -o $(shared_lib) rm $(object) clean: diff --git a/sql/usql.cl b/sql/usql.cl index 5afb663..9d96874 100644 --- a/sql/usql.cl +++ b/sql/usql.cl @@ -8,7 +8,7 @@ ;;;; Programmers: Kevin M. Rosenberg and onShore Development Inc ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id: usql.cl,v 1.1 2002/04/01 05:27:55 kevin Exp $ +;;;; $Id: usql.cl,v 1.2 2002/04/03 17:58:23 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and onShore Development Inc @@ -96,14 +96,14 @@ specifies the database to operation on, defaulting to (defun sequence-next (name &key (database *default-database*)) (database-sequence-next name database)) - +#+ignore (defclass sql-typecast-exp (sql-value-exp) () (:documentation "An SQL typecast expression.") ) - +#+ignore (defclass sql-value-exp (%sql-expression) ((modifier :initarg :modifier -- 2.34.1