Mercurial > lxmppd-hg-xmllex / changeset
changeset
Automated merge with http://84.46.7.57:1234
Wed, 03 Dec 2008 19:34:41 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Wed, 03 Dec 2008 19:34:41 +0000
- changeset 535
- 74f32ac6db40
- parent 534
- 684cd8aedc1a (diff)
- parent 532
- c24471cadc2c (current diff)
- child 536
- dfe06eab47c0
Automated merge with http://84.46.7.57:1234
--- a/configure Wed Dec 03 18:06:04 2008 +0000 +++ b/configure Wed Dec 03 19:34:41 2008 +0000 @@ -125,7 +125,8 @@ LUA_INCDIR_SET=yes LUA_LIBDIR=/usr/local/lib LUA_LIBDIR_SET=yes - CFLAGS="-bundle -Wl,-undefined,dynamic_lookup" + CFLAGS="" + LFLAGS="-bundle -undefined dynamic_lookup" fi fi
--- a/util-src/Makefile Wed Dec 03 18:06:04 2008 +0000 +++ b/util-src/Makefile Wed Dec 03 19:34:41 2008 +0000 @@ -12,16 +12,21 @@ all: encodings.so hashes.so install: encodings.so hashes.so - install -s *.so ../util/ + install *.so ../util/ clean: rm -f *.so rm -f ../util/*.so -encodings.so: encodings.c - gcc $(CFLAGS) encodings.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so +encodings.o: encodings.c + gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c +encodings.so: encodings.o + export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -lcrypto -lidn + -hashes.so: hashes.c - gcc $(CFLAGS) hashes.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so +hashes.o: hashes.c + gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c +hashes.so: hashes.o + export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -lcrypto -lssl
