Merge 0.10->trunk

[prosody.git] / util-src / Makefile.win

diff --git a/util-src/Makefile.win b/util-src/Makefile.win
index 00b3f6fc2f1421cb5730cc923dc0c0ae274c19fa..7b14109776a174b3fae19581d2ef46a9ddfb0195 100644 (file)
--- a/util-src/Makefile.win
+++ b/util-src/Makefile.win
@@ -12,18 +12,27 @@ IDN_INCLUDE2=$(IDN_PATH)\win32\include
 OPENSSL_LIB=$(OPENSSL_PATH)\out32dll\libeay32.lib
 OPENSSL_INCLUDE=$(OPENSSL_PATH)\include
 
-all: encodings.dll hashes.dll
+CL=cl /LD /MD /nologo
 
-install: encodings.dll hashes.dll
+all: encodings.dll hashes.dll windows.dll
+
+install: encodings.dll hashes.dll windows.dll
        copy /Y *.dll ..\util\
 
 clean:
-       del encodings.dll encodings.exp encodings.lib encodings.obj
-       del hashes.dll hashes.exp hashes.lib hashes.obj
+       del encodings.dll encodings.exp encodings.lib encodings.obj encodings.dll.manifest
+       del hashes.dll hashes.exp hashes.lib hashes.obj hashes.dll.manifest
+       del windows.dll windows.exp windows.lib windows.obj windows.dll.manifest
 
 encodings.dll: encodings.c
-       cl /LD /nologo encodings.c /I"$(LUA_INCLUDE)" /I"$(IDN_INCLUDE1)" /I"$(IDN_INCLUDE2)" /link "$(LUA_LIB)" "$(IDN_LIB)" /export:luaopen_util_encodings
+       $(CL) encodings.c /I"$(LUA_INCLUDE)" /I"$(IDN_INCLUDE1)" /I"$(IDN_INCLUDE2)" /link "$(LUA_LIB)" "$(IDN_LIB)" /export:luaopen_util_encodings
+       del encodings.exp encodings.lib encodings.obj encodings.dll.manifest
 
 hashes.dll: hashes.c
-       cl /LD /nologo hashes.c /I"$(LUA_INCLUDE)" /I"$(OPENSSL_INCLUDE)" /link "$(LUA_LIB)" "$(OPENSSL_LIB)" /export:luaopen_util_hashes
+       $(CL) hashes.c /I"$(LUA_INCLUDE)" /I"$(OPENSSL_INCLUDE)" /link "$(LUA_LIB)" "$(OPENSSL_LIB)" /export:luaopen_util_hashes
+       del hashes.exp hashes.lib hashes.obj hashes.dll.manifest
+
+windows.dll: windows.c
+       $(CL) windows.c /I"$(LUA_INCLUDE)" /link "$(LUA_LIB)" dnsapi.lib /export:luaopen_util_windows
+       del windows.exp windows.lib windows.obj windows.dll.manifest