boot-132.tar.gz

[apple/boot.git] / i386 / libsaio / Makefile

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 550acbff77db0838f48f04bfb8f58b9d8bdf5cab..517f14165837af091f265380dc0a140c7638732f 100644 (file)
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -5,15 +5,18 @@ include ../MakePaths.dir
 UTILDIR = ../util
 LIBSADIR = ../libsa
 INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
 UTILDIR = ../util
 LIBSADIR = ../libsa
 INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone

-SYMROOT=
-
-OPTIM = -Os
-CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Wno-precomp \
-    -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER -munaligned-text -static \
-       -traditional-cpp -DRCZ_COMPRESSED_FILE_SUPPORT
+#SYMROOT=
+
+OPTIM = -Os -Oz
+CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
+    -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \
+    -DRCZ_COMPRESSED_FILE_SUPPORT \
+    -fno-builtin -static -fomit-frame-pointer \
+    -mpreferred-stack-boundary=2 -fno-align-functions \
+    -mno-sse2 -mfpmath=387

 DEFINES=
 CONFIG = hd
 DEFINES=
 CONFIG = hd

-INC = -I../rcz -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I/System/Library/Frameworks/System.framework/PrivateHeaders
+INC = -I../rcz -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)

 ifneq "" "$(wildcard /bin/mkdirs)"
   MKDIRS = /bin/mkdirs
 else
 ifneq "" "$(wildcard /bin/mkdirs)"
   MKDIRS = /bin/mkdirs
 else


@@ -26,11 +29,13 @@ LIBS=
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
 
 VPATH = $(OBJROOT):$(SYMROOT)
 

-SAIO_OBJS = table.o asm.o biosfn.o misc.o gets.o \
-       vga.o disk.o sys.o cache.o \
-       ufs_byteorder.o bootstruct.o \
-       stringTable.o load.o \
-       bios.o pci.o vbe.o nbp.o
+SAIO_OBJS = table.o asm.o bios.o biosfn.o \
+       disk.o sys.o cache.o bootstruct.o \
+       stringTable.o load.o memory.o misc.o \
+       ufs.o ufs_byteorder.o \
+       vbe.o nbp.o hfs.o hfs_compare.o \
+       xml.o ntfs.o msdos.o md5c.o device_tree.o
+

 
 SAIO_EXTERN_OBJS = console.o
 
 
 SAIO_EXTERN_OBJS = console.o
 


@@ -60,7 +65,7 @@ all: $(DIRS_NEEDED) libsaio.h $(LIBS)
 
 libsaio.a: $(SAIO_EXTERN_OBJS) $(SAIO_OBJS)
        rm -f $(SYMROOT)/$(@F)
 
 libsaio.a: $(SAIO_EXTERN_OBJS) $(SAIO_OBJS)
        rm -f $(SYMROOT)/$(@F)

-       ar q $(SYMROOT)/$(@F) $(SAIO_EXTERN_OBJS) $(SAIO_OBJS)
+       ar q $(SYMROOT)/$(@F) $^

        ranlib $(SYMROOT)/$(@F)
 
 #saio_internal.h: saio_external.h
        ranlib $(SYMROOT)/$(@F)
 
 #saio_internal.h: saio_external.h