Index: util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
retrieving revision 1.24
diff -u -r1.24 makefile.mk
--- util/makefile.mk	12 Jun 2003 10:06:50 -0000	1.24
+++ util/makefile.mk	30 Jul 2003 15:40:18 -0000
@@ -166,8 +166,10 @@
 	$(SLB)$/ui1.lib\
 	$(SLB)$/ui2.lib
 
+.IF "$(OS)"!="MACOSX"
 # static libraries
 SHL2STDLIBS+= $(SCHLIB) $(SMLIB)
+.ENDIF
 
 # dynamic libraries
 SHL2STDLIBS+= \
@@ -185,13 +187,18 @@
 	$(SOTLIB) \
 	$(UNOTOOLSLIB) \
 	$(TOOLSLIB) \
-    $(COMPHELPERLIB) \
+	$(COMPHELPERLIB) \
 	$(UCBHELPERLIB) \
 	$(CPPUHELPERLIB) \
 	$(CPPULIB) \
 	$(VOSLIB) \
 	$(SALLIB) \
-    $(ICUUCLIB)
+	$(ICUUCLIB)
+
+.IF "$(OS)"=="MACOSX"
+# static libraries at end for OS X
+SHL2STDLIBS+= $(SCHLIB) $(SMLIB)
+.ENDIF
 
 .IF "$(GUI)"=="WNT"
 SHL2STDLIBS+= advapi32.lib