From 79cd30e5bb24c5a8d2eea188e15109e544f8638b Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 3 Apr 2002 03:58:00 +0000
Subject: [PATCH] r1728: *** empty log message ***

---
 doc/intro.sgml    |  4 ++--
 examples/Makefile | 26 ++++++++------------------
 tests/Makefile    | 26 ++++++++------------------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/doc/intro.sgml b/doc/intro.sgml
index 6f8b9b6..5f349bf 100644
--- a/doc/intro.sgml
+++ b/doc/intro.sgml
@@ -41,9 +41,9 @@ particular C-library.
     <para> The primary tested and supported platforms for &uffi; are: 
     </para>
     <itemizedlist mark="opencircle">
-      <listitem><para>&acl; v6.1 on Redhat Linux 7.2 and Microsoft Windows.</para></listitem>
+      <listitem><para>&acl; v6.1 on Redhat Linux 7.2, FreeBSD 4.5, and Microsoft Windows.</para></listitem>
       <listitem><para>&lw; v4.2 on Redhat Linux 7.2 and Microsoft Windows.</para></listitem>
-      <listitem><para>&cmucl; 18c on Redhat Linux 7.2.</para></listitem>
+      <listitem><para>&cmucl; 18c on Redhat Linux 7.2, FreeBSD 4.5, and Solaris 2.8</para></listitem>
     </itemizedlist>
   </sect1>
 
diff --git a/examples/Makefile b/examples/Makefile
index acb7591..7ca6cd2 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.7 2002/04/03 00:57:48 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.8 2002/04/03 03:58:00 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -13,19 +13,16 @@
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
-AR=ar
 
 # These variables are correct for GCC
 CC=gcc
-#SHARED_CC_OPT=-fPIC # For Linux (ACL) and all platfroms (CMUCL)
-SHARED_CC_OPT=-fPIC -DPIC # For FreeBSD (ACL)
+SHARED_CC_OPT=-fPIC -DPIC
 
-#SHARED_LD_OPT=-shared  # For Linux
+#SHARED_LD_OPT=-shared  # For Linux (ACL,LW,CMUCL)
 #SHARED_LD_OPT=-r # For Linux and Solaris (CMUCL)
-SHARED_LD_OPT=-Bshareable -Bdynamic  # For FreeBSD (ACL)
+SHARED_LD_OPT=-Bshareable -Bdynamic  # For Linux (ALL) and FreeBSD (ACL)
 
-# If you are using Solaris with Sun's CC, these are the correct values
-# for creating a shared library
+# Use these for Sun's C compiler and Solaris (ACL)
 #CC=cc
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
@@ -37,23 +34,16 @@ base=c-test-fns
 source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
-static_lib=$(base).a
 
-all: $(shared_lib) $(static_lib)
+all: $(shared_lib)
 
-$(shared_lib): $(source)
+$(shared_lib): $(source) Makefile
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
 	ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
-	$(AR) r $(static_lib) $(object)
-	rm $(object)
-
-$(static_lib): $(source)
-	${CC} -c -fpic $(source) -o $(object)
-	$(AR) r $(static_lib) $(object)
 	rm $(object)
 
 clean:
-	rm -f $(object) $(static_lib) $(shared_lib)
+	rm -f $(object) $(shared_lib)
 
 realclean: clean
 	rm -f *~
diff --git a/tests/Makefile b/tests/Makefile
index acb7591..7ca6cd2 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.7 2002/04/03 00:57:48 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.8 2002/04/03 03:58:00 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -13,19 +13,16 @@
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 
-AR=ar
 
 # These variables are correct for GCC
 CC=gcc
-#SHARED_CC_OPT=-fPIC # For Linux (ACL) and all platfroms (CMUCL)
-SHARED_CC_OPT=-fPIC -DPIC # For FreeBSD (ACL)
+SHARED_CC_OPT=-fPIC -DPIC
 
-#SHARED_LD_OPT=-shared  # For Linux
+#SHARED_LD_OPT=-shared  # For Linux (ACL,LW,CMUCL)
 #SHARED_LD_OPT=-r # For Linux and Solaris (CMUCL)
-SHARED_LD_OPT=-Bshareable -Bdynamic  # For FreeBSD (ACL)
+SHARED_LD_OPT=-Bshareable -Bdynamic  # For Linux (ALL) and FreeBSD (ACL)
 
-# If you are using Solaris with Sun's CC, these are the correct values
-# for creating a shared library
+# Use these for Sun's C compiler and Solaris (ACL)
 #CC=cc
 #SHARED_CC_OPT=-KPIC
 #SHARED_LD_OPT=-G
@@ -37,23 +34,16 @@ base=c-test-fns
 source=$(base).c
 object=$(base).o
 shared_lib=$(base).so
-static_lib=$(base).a
 
-all: $(shared_lib) $(static_lib)
+all: $(shared_lib)
 
-$(shared_lib): $(source)
+$(shared_lib): $(source) Makefile
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
 	ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
-	$(AR) r $(static_lib) $(object)
-	rm $(object)
-
-$(static_lib): $(source)
-	${CC} -c -fpic $(source) -o $(object)
-	$(AR) r $(static_lib) $(object)
 	rm $(object)
 
 clean:
-	rm -f $(object) $(static_lib) $(shared_lib)
+	rm -f $(object) $(shared_lib)
 
 realclean: clean
 	rm -f *~
-- 
2.34.1