From 3e0757064c7702e8d0572fbf61fb867080bb1da9 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 23 Oct 2002 19:51:20 +0000
Subject: [PATCH] r3154: *** empty log message ***

---
 examples/Makefile | 37 +++++++++++++++----------------------
 src/os.lisp       |  8 +++++---
 tests/Makefile    | 37 +++++++++++++++----------------------
 3 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/examples/Makefile b/examples/Makefile
index ebfe4d5..c9f4f84 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.15 2002/09/20 04:51:14 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.16 2002/10/23 19:51:12 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -20,24 +20,6 @@ include ../Makefile.common
 .PHONY: distclean
 distclean: clean
 
-# GCC Section
-CC=gcc
-SHARED_CC_OPT=-fPIC -DPIC
-
-SHARED_LD_OPT=-shared  # For Linux (ALL) and FreeBSD (ACL)
-
-# For MacOSX (ACL)
-# cc -dynamic -c c-test-fns.c -o foo.o
-# ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o 
-# c-test-fns.dylib foo.o
-
-# Use these for Sun's C compiler and Solaris (ACL)
-#CC=cc
-#SHARED_CC_OPT=-KPIC
-#SHARED_LD_OPT=-G
-
-
-# Nothing to configure beyond this point
 
 base=c-test-fns
 source=$(base).c
@@ -47,8 +29,19 @@ shared_lib=$(base).so
 .PHONY: all
 all: $(shared_lib)
 
-$(shared_lib): $(source) Makefile
-	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
-	gcc ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+linux: $(source) Makefile
+	gcc -fPIC -DPIC -c $(source) -o $(object)
+	gcc -shared $(object) -o $(shared_lib)
 	rm $(object)
 
+mac:
+	cc -dynamic -c $(source) -o $(object)
+	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)
+
+solaris:
+	cc -KPIC -c $(source) -o $(object)
+	cc -G $(object) -o $(shared_lib)
+
+aix-acl:
+	gcc -c -D_BSD -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void $(source)
+	make_shared -o $(shared_lib) $(object)
diff --git a/src/os.lisp b/src/os.lisp
index a1b7c87..918425c 100644
--- a/src/os.lisp
+++ b/src/os.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Sep 2002 
 ;;;;
-;;;; $Id: os.lisp,v 1.3 2002/10/21 15:42:07 kevin Exp $
+;;;; $Id: os.lisp,v 1.4 2002/10/23 19:51:20 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg.
 ;;;; Much of this code was taken from other open source project and copyright
@@ -24,11 +24,13 @@
 
 ;; modified from function ASDF -- Copyright Dan Barlow and Contributors
 
-(defun run-shell-command ((control-string &key (output *trace-output*))
-			  &rest args)
+(defun run-shell-command (control-string  &rest args &key output)
   "Interpolate ARGS into CONTROL-STRING as if by FORMAT, and
 synchronously execute the result using a Bourne-compatible shell, with
 output to *trace-output*.  Returns the shell's exit code."
+  (unless output
+    (setq output *trace-output*))
+
   (let ((command (apply #'format nil control-string args)))
     #+sbcl
     (sb-impl::process-exit-code
diff --git a/tests/Makefile b/tests/Makefile
index ebfe4d5..c9f4f84 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.15 2002/09/20 04:51:14 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.16 2002/10/23 19:51:12 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -20,24 +20,6 @@ include ../Makefile.common
 .PHONY: distclean
 distclean: clean
 
-# GCC Section
-CC=gcc
-SHARED_CC_OPT=-fPIC -DPIC
-
-SHARED_LD_OPT=-shared  # For Linux (ALL) and FreeBSD (ACL)
-
-# For MacOSX (ACL)
-# cc -dynamic -c c-test-fns.c -o foo.o
-# ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o 
-# c-test-fns.dylib foo.o
-
-# Use these for Sun's C compiler and Solaris (ACL)
-#CC=cc
-#SHARED_CC_OPT=-KPIC
-#SHARED_LD_OPT=-G
-
-
-# Nothing to configure beyond this point
 
 base=c-test-fns
 source=$(base).c
@@ -47,8 +29,19 @@ shared_lib=$(base).so
 .PHONY: all
 all: $(shared_lib)
 
-$(shared_lib): $(source) Makefile
-	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
-	gcc ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+linux: $(source) Makefile
+	gcc -fPIC -DPIC -c $(source) -o $(object)
+	gcc -shared $(object) -o $(shared_lib)
 	rm $(object)
 
+mac:
+	cc -dynamic -c $(source) -o $(object)
+	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)
+
+solaris:
+	cc -KPIC -c $(source) -o $(object)
+	cc -G $(object) -o $(shared_lib)
+
+aix-acl:
+	gcc -c -D_BSD -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void $(source)
+	make_shared -o $(shared_lib) $(object)
-- 
2.34.1