From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 26 May 2006 22:23:54 +0000 (+0000)
Subject: Óscar Morales Vivó updated the libcurl.framework.make file.
X-Git-Tag: upstream/7.37.1~10337
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e877cb7bd7d83db5fe6601dd20368923fb705a7d;p=platform%2Fupstream%2Fcurl.git

Óscar Morales Vivó updated the libcurl.framework.make file.
---

diff --git a/CHANGES b/CHANGES
index 363f3d9..009a43f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel (27 May 2006)
+- Óscar Morales Vivó updated the libcurl.framework.make file.
+
 Daniel (26 May 2006)
 - Olaf Stüben fixed a bug that caused Digest authentication with md5-sess to
   fail. When using the md5-sess, the result was not Md5 encoded and Base64
diff --git a/lib/libcurl.framework.make b/lib/libcurl.framework.make
index 1d5dcb8..a46546e 100644
--- a/lib/libcurl.framework.make
+++ b/lib/libcurl.framework.make
@@ -3,19 +3,27 @@
 TMP_DIR = ../lib/.lib
 LIB_DIR = ../lib
 
+# Sets the SDK. 10.4u.sdk is the minimum for building a Universal Binary.
+SDK = /Developer/SDKs/MacOSX10.4u.sdk
+
+# Sets the minimum OSX version where the framework will work.
+ENVP = MACOSX_DEPLOYMENT_TARGET=10.3
+
 # for debug symbols add the -g option.  Remove the -O2 option for best debuggin.
 # Can be compiled with -O3 optimizations.
-C_OPTIONS = \
+C_OPTIONS = -isysroot $(SDK) \
 	-fno-common \
-	-O2 \
+	-Os \
 	-DHAVE_CONFIG_H \
 	-DPIC \
 	-I../lib \
 	-I../include \
-	-Wall
+	-Wall \
+	-arch ppc \
+	-arch i386
 
-LIBRARIES = /usr/lib/libssl.dylib \
-	/usr/lib/libcrypto.dylib \
+LIBRARIES = $(SDK)/usr/lib/libssl.dylib \
+	$(SDK)/usr/lib/libcrypto.dylib \
 	-lz 
 
 # These libtool options are needed for a framework.
@@ -25,7 +33,11 @@ LIBRARIES = /usr/lib/libssl.dylib \
 # For prebinding 0x10400000 was chosen a bit at random.  
 # If this overlaps one of you current libs just change in the makefile. 
 # This address is safe for all built in frameworks.  
-LINK_OPTIONS = -prebind \
+LINK_OPTIONS = \
+	-Wl,-syslibroot,$(SDK) \
+	-arch ppc \
+	-arch i386 \
+	-prebind \
 	-seg1addr 0x10400000 \
 	-dynamiclib \
 	-install_name @executable_path/../Frameworks/libcurl.framework/libcurl
@@ -71,6 +83,7 @@ OBJECTS = $(TMP_DIR)/base64.o \
 	$(TMP_DIR)/parsedate.o \
 	$(TMP_DIR)/progress.o \
 	$(TMP_DIR)/security.o \
+	$(TMP_DIR)/select.o \
 	$(TMP_DIR)/sendf.o \
 	$(TMP_DIR)/share.o \
 	$(TMP_DIR)/speedcheck.o \
@@ -81,6 +94,7 @@ OBJECTS = $(TMP_DIR)/base64.o \
 	$(TMP_DIR)/strtok.o \
 	$(TMP_DIR)/strtoofft.o \
 	$(TMP_DIR)/telnet.o \
+	$(TMP_DIR)/tftp.o \
 	$(TMP_DIR)/timeval.o \
 	$(TMP_DIR)/transfer.o \
 	$(TMP_DIR)/url.o \
@@ -97,12 +111,16 @@ $(LIB_DIR) :
 # This builds the framework structure and links everything properly	
 $(LIB_DIR)/libcurl.framework: $(OBJECTS) $(LIB_DIR)/libcurl.plist
 	mkdir -p $(LIB_DIR)/libcurl.framework/Versions/A/Resources
-	$(CC) $(LINK_OPTIONS) $(LIBRARIES) $(OBJECTS) \
+	 $(ENVP) $(CC) $(LINK_OPTIONS) $(LIBRARIES) $(OBJECTS) \
 		-o $(LIB_DIR)/libcurl.framework/Versions/A/libcurl
 	cp $(LIB_DIR)/libcurl.plist $(LIB_DIR)/libcurl.framework/Versions/A/Resources/Info.plist
+	mkdir -p $(LIB_DIR)/libcurl.framework/Versions/A/Headers
+	cp $(LIB_DIR)/../include/curl/* $(LIB_DIR)/libcurl.framework/Versions/A/Headers
+	rm $(LIB_DIR)/libcurl.framework/Versions/A/Headers/Make*
 	cd $(LIB_DIR)/libcurl.framework; \
 	ln -fs ./Versions/A/libcurl libcurl; \
-	ln -fs ./Versions/A/Resources Resources
+	ln -fs ./Versions/A/Resources Resources; \
+	ln -fs ./Versions/A/Headers Headers
 	cd $(LIB_DIR)/libcurl.framework/Versions; \
 	ln -fs ./A Current