X-Git-Url: https://git.saurik.com/apple/libsystem.git/blobdiff_plain/435227b93679cc708af396fe8d4a13a290e831bd..7bf534a36dd3e0870f68fb6a93fc0e3f6397b5cd:/Makefile

diff --git a/Makefile b/Makefile
index 08f6bc2..8b7bc07 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,12 @@ NAME = System
 PROJECTVERSION = 2.8
 PROJECT_TYPE = Library
 
-OTHERLINKED = SystemMath.s
-
-OTHERSRCS = Makefile.preamble Makefile Makefile.postamble System.order
-
+OTHERLINKED = SystemMath.s spinlock_stub.s spinlocktry_stub.s spinunlock_stub.s
 OTHERLINKEDOFILES = SystemMath.o
 
+OTHERSRCS = GNUmakefile Makefile.preamble Makefile Makefile.postamble \
+	    System.order Info.plist CommPageSymbols.st
+
 MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
 CURRENTLY_ACTIVE_VERSION = YES
 DEPLOY_WITH_VERSION_NAME = B
@@ -26,15 +26,27 @@ MAKEFILE = library.make
 NEXTSTEP_INSTALLDIR = $(USRLIBDIR)
 WINDOWS_INSTALLDIR = /Library/Frameworks
 PDO_UNIX_INSTALLDIR = /Library/Frameworks
-LIBS = -lc -lcurses -ldyld -ledit -linfo -lkvm -lm -lmacho\
-       -lstreams -lunc -lkeymgr
+
+ifneq ($(filter %64,$(RC_ARCHS)),)
+LP64 = 1
+endif
+LIBS = -lc -lcommonCrypto -ldyldapis -linfo -lm -lmacho\
+       -lnotify -lunc -lkeymgr
+ifndef LP64
+LIBS += -lstreams -lkvm -llaunch
+endif
 DEBUG_LIBS = $(LIBS)
 PROF_LIBS = $(LIBS)
 
+ifdef ALTUSRLOCALLIBSYSTEM
+LIBSYS = $(ALTUSRLOCALLIBSYSTEM)
+else
+LIBSYS = $(NEXT_ROOT)/usr/local/lib/system
+endif
 
-LIBRARY_PATHS = -L$(NEXT_ROOT)/usr/local/lib/system
-NEXTSTEP_PB_CFLAGS = -Wall -Werror
-NEXTSTEP_PB_LDFLAGS = -nostdlib -all_load
+LIBRARY_PATHS = -L$(LIBSYS)
+NEXTSTEP_PB_CFLAGS = -Wall -Werror -I$(NEXT_ROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
+NEXTSTEP_PB_LDFLAGS = -nostdlib -all_load -multi_module -Wl,-search_paths_first
 
 
 NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc