From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 3 Apr 2002 00:57:48 +0000 (+0000)
Subject: r1726: *** empty log message ***
X-Git-Tag: v1.6.1~521
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=29509e6db7160379e3181cbcee911bee03ed2b28

r1726: *** empty log message ***
---

diff --git a/examples/Makefile b/examples/Makefile
index 269d032..acb7591 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.6 2002/04/03 00:31:32 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.7 2002/04/03 00:57:48 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -17,10 +17,12 @@ AR=ar
 
 # These variables are correct for GCC
 CC=gcc
-SHARED_CC_OPT=-fpic
+#SHARED_CC_OPT=-fPIC # For Linux (ACL) and all platfroms (CMUCL)
+SHARED_CC_OPT=-fPIC -DPIC # For FreeBSD (ACL)
 
 #SHARED_LD_OPT=-shared  # For Linux
-SHARED_LD_OPT=-r # For FreeBSD and Solaris
+#SHARED_LD_OPT=-r # For Linux and Solaris (CMUCL)
+SHARED_LD_OPT=-Bshareable -Bdynamic  # For FreeBSD (ACL)
 
 # If you are using Solaris with Sun's CC, these are the correct values
 # for creating a shared library
@@ -37,7 +39,7 @@ object=$(base).o
 shared_lib=$(base).so
 static_lib=$(base).a
 
-all: $(shared_lib)
+all: $(shared_lib) $(static_lib)
 
 $(shared_lib): $(source)
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
@@ -46,7 +48,7 @@ $(shared_lib): $(source)
 	rm $(object)
 
 $(static_lib): $(source)
-	${CC} -c $(source) -o $(object)
+	${CC} -c -fpic $(source) -o $(object)
 	$(AR) r $(static_lib) $(object)
 	rm $(object)
 
diff --git a/examples/union.cl b/examples/union.cl
index a18dfec..c3349c6 100644
--- a/examples/union.cl
+++ b/examples/union.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: union.cl,v 1.6 2002/04/03 00:50:46 kevin Exp $
+;;;; $Id: union.cl,v 1.7 2002/04/03 00:57:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -66,8 +66,6 @@
 	       #\A
 	       :test #'eql
 	       :fail-info "Error with union character")
-    (print (uffi:get-slot-value u 'tunion1 'uint))
-    (print (uffi:get-slot-value u 'tunion1 'int))
     #-(or sparc sparc-v9)
     (util.test:test (> 0 (uffi:get-slot-value u 'tunion1 'int))
 	       t
diff --git a/tests/Makefile b/tests/Makefile
index 269d032..acb7591 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.6 2002/04/03 00:31:32 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.7 2002/04/03 00:57:48 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -17,10 +17,12 @@ AR=ar
 
 # These variables are correct for GCC
 CC=gcc
-SHARED_CC_OPT=-fpic
+#SHARED_CC_OPT=-fPIC # For Linux (ACL) and all platfroms (CMUCL)
+SHARED_CC_OPT=-fPIC -DPIC # For FreeBSD (ACL)
 
 #SHARED_LD_OPT=-shared  # For Linux
-SHARED_LD_OPT=-r # For FreeBSD and Solaris
+#SHARED_LD_OPT=-r # For Linux and Solaris (CMUCL)
+SHARED_LD_OPT=-Bshareable -Bdynamic  # For FreeBSD (ACL)
 
 # If you are using Solaris with Sun's CC, these are the correct values
 # for creating a shared library
@@ -37,7 +39,7 @@ object=$(base).o
 shared_lib=$(base).so
 static_lib=$(base).a
 
-all: $(shared_lib)
+all: $(shared_lib) $(static_lib)
 
 $(shared_lib): $(source)
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
@@ -46,7 +48,7 @@ $(shared_lib): $(source)
 	rm $(object)
 
 $(static_lib): $(source)
-	${CC} -c $(source) -o $(object)
+	${CC} -c -fpic $(source) -o $(object)
 	$(AR) r $(static_lib) $(object)
 	rm $(object)
 
diff --git a/tests/union.cl b/tests/union.cl
index a18dfec..c3349c6 100644
--- a/tests/union.cl
+++ b/tests/union.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: union.cl,v 1.6 2002/04/03 00:50:46 kevin Exp $
+;;;; $Id: union.cl,v 1.7 2002/04/03 00:57:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -66,8 +66,6 @@
 	       #\A
 	       :test #'eql
 	       :fail-info "Error with union character")
-    (print (uffi:get-slot-value u 'tunion1 'uint))
-    (print (uffi:get-slot-value u 'tunion1 'int))
     #-(or sparc sparc-v9)
     (util.test:test (> 0 (uffi:get-slot-value u 'tunion1 'int))
 	       t