fixes to makefiles

plugins/NTMakefile

@@ -64,48 +64,48 @@ compat_objs = getaddrinfo.obj getnameinfo.obj
 common_sources = plugin_common.c plugin_common.h
 common_objs = plugin_common.obj $(compat_objs)
 
-saslANONYMOUS_sources = anonymous.c anonymous_init.c $(common_sources)
-saslANONYMOUS_objs = anonymous.obj anonymous_init.obj $(common_objs)
+saslANONYMOUS_sources = anonymous.c $(common_sources)
+saslANONYMOUS_objs = anonymous.obj $(common_objs)
 saslANONYMOUS_out = saslANONYMOUS.dll saslANONYMOUS.exp saslANONYMOUS.lib
 
-saslPLAIN_sources = plain.c plain_init.c $(common_sources)
-saslPLAIN_objs = plain.obj plain_init.obj $(common_objs)
+saslPLAIN_sources = plain.c $(common_sources)
+saslPLAIN_objs = plain.obj $(common_objs)
 saslPLAIN_out = saslPLAIN.dll saslPLAIN.exp saslPLAIN.lib
 
-saslCRAMMD5_sources = cram.c crammd5_init.c $(common_sources)
-saslCRAMMD5_objs = cram.obj crammd5_init.obj $(common_objs)
+saslCRAMMD5_sources = cram.c $(common_sources)
+saslCRAMMD5_objs = cram.obj $(common_objs)
 saslCRAMMD5_out = saslCRAMMD5.dll saslCRAMMD5.exp saslCRAMMD5.lib
 
-saslDIGESTMD5_sources = digestmd5.c digestmd5_init.c $(common_sources)
-saslDIGESTMD5_objs = digestmd5.obj digestmd5_init.obj $(common_objs)
+saslDIGESTMD5_sources = digestmd5.c $(common_sources)
+saslDIGESTMD5_objs = digestmd5.obj $(common_objs)
 saslDIGESTMD5_out = saslDIGESTMD5.dll saslDIGESTMD5.exp saslDIGESTMD5.lib
 
-saslLOGIN_sources = login.c login_init.c $(common_sources)
-saslLOGIN_objs = login.obj login_init.obj $(common_objs)
+saslLOGIN_sources = login.c $(common_sources)
+saslLOGIN_objs = login.obj $(common_objs)
 saslLOGIN_out = saslLOGIN.dll saslLOGIN.exp saslLOGIN.lib
 
-saslSCRAM_sources = scram.c scram_init.c $(common_sources)
-saslSCRAM_objs = scram.obj scram_init.obj $(common_objs)
+saslSCRAM_sources = scram.c $(common_sources)
+saslSCRAM_objs = scram.obj $(common_objs)
 saslSCRAM_out = saslSCRAM.dll saslSCRAM.exp saslSCRAM.lib
 
-saslNTLM_sources = ntlm.c ntlm_init.c $(common_sources)
-saslNTLM_objs = ntlm.obj ntlm_init.obj $(common_objs)
+saslNTLM_sources = ntlm.c $(common_sources)
+saslNTLM_objs = ntlm.obj $(common_objs)
 saslNTLM_out = saslNTLM.dll saslNTLM.exp saslNTLM.lib
 
-saslGSSAPI_sources = gssapi.c gssapiv2_init.c $(common_sources)
-saslGSSAPI_objs = gssapi.obj gssapiv2_init.obj $(common_objs)
+saslGSSAPI_sources = gssapi.c $(common_sources)
+saslGSSAPI_objs = gssapi.obj $(common_objs)
 saslGSSAPI_out = saslGSSAPI.dll saslGSSAPI.exp saslGSSAPI.lib
 
-saslSRP_sources = srp.c srp_init.c $(common_sources)
-saslSRP_objs = srp.obj srp_init.obj $(common_objs)
+saslSRP_sources = srp.c $(common_sources)
+saslSRP_objs = srp.obj $(common_objs)
 saslSRP_out = saslSRP.dll saslSRP.exp saslSRP.lib
 
-saslOTP_sources = otp.c otp_init.c $(common_sources)
-saslOTP_objs = otp.obj otp_init.obj $(common_objs)
+saslOTP_sources = otp.c $(common_sources)
+saslOTP_objs = otp.obj $(common_objs)
 saslOTP_out = saslOTP.dll saslOTP.exp saslOTP.lib
 
-saslSQL_sources = sql.c sql_init.c $(common_sources)
-saslSQL_objs = sql.obj sql_init.obj $(common_objs)
+saslSQL_sources = sql.c $(common_sources)
+saslSQL_objs = sql.obj $(common_objs)
 # saslSQL_out is an agregation of all generated files for all SQL plugins
 saslSQL_out = saslSQLITE.dll saslSQLITE.exp saslSQLITE.lib
 
@@ -128,7 +128,7 @@ GSS_LIBS=
 !ENDIF
 
 !IF "$(SASLDB)" == "LMDB"
-DB_LIBS=/libpath:$(LMDB_LIBPATH) lmdb.lib
+DB_LIBS=/libpath:$(LMDB_LIBPATH) liblmdb_a.lib
 
 # Auxprop Plugin
 libsasldb_sources = allockey.c db_lmdb.c
@@ -145,8 +145,8 @@ CRAM_FLAGS=/DOBSOLETE_CRAM_ATTR=1
 
 DIGEST_FLAGS=/D "WITH_RC4"
 
-saslSASLDB_sources = sasldb.c sasldb_init.c $(libsasldb_sources) $(common_sources)
-saslSASLDB_objs = sasldb.obj sasldb_init.obj $(libsasldb_objs) $(common_objs)
+saslSASLDB_sources = sasldb.c $(libsasldb_sources) $(common_sources)
+saslSASLDB_objs = sasldb.obj $(libsasldb_objs) $(common_objs)
 saslSASLDB_out = saslSASLDB.dll saslSASLDB.exp saslSASLDB.lib
 
 all_objs = $(saslANONYMOUS_objs) $(saslPLAIN_objs) $(saslCRAMMD5_objs) $(saslDIGESTMD5_objs) $(saslLOGIN_objs) $(saslSCRAM_objs) $(saslNTLM_objs) $(saslGSSAPI_objs) $(saslSRP_objs) $(saslOTP_objs) $(saslSASLDB_objs) $(saslSQL_objs) $(saslLDAPDB_objs)
@@ -162,7 +162,7 @@ EXTRA_FLAGS = /D TARGET_WIN_SYSTEM=$(TARGET_WIN_SYSTEM) $(EXTRA_FLAGS)
 EXTRA_FLAGS=$(EXTRA_FLAGS) $(DB_FLAGS) $(OPENSSL_FLAGS) $(GSS_FLAGS) $(SRP_FLAGS) $(SQL_FLAGS) $(DIGEST_FLAGS) $(CRAM_FLAGS) $(LDAP_FLAGS)
 CPPFLAGS = /I "..\win32\include" /I "." /I "..\include" $(EXTRA_FLAGS) /D "WIN32" /D "_WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
 
-OPENSSL_LIBS=/libpath:$(OPENSSL_LIBPATH) libeay32.lib ssleay32.lib
+OPENSSL_LIBS=/libpath:$(OPENSSL_LIBPATH) libssl.lib libcrypto.lib
 
 # Where to install files from this directory
 libdir = $(prefix)\lib

win32/common.mak

@@ -26,7 +26,7 @@ LINK32EXE=$(LINK32)
 # It seems that -lib must be the first parameter
 LINK32LIB=link.exe /lib /nologo
 
-SYS_LIBS=ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
+SYS_LIBS=ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib ntdll.lib
 
 !IF "$(BITS)" == "64"
 SYS_LIBS=$(SYS_LIBS) bufferoverflowU.lib
@@ -121,7 +121,7 @@ GSSAPI_LIBPATH="C:\Program Files\CyberSafe\Developer Pack\ApplicationSecuritySDK
 !ENDIF
 !ENDIF
 
-!IF "$(SQLITE_INCLUDE)" == ""
+!IF "$(SQLITE_INCLUDES)" == ""
 SQLITE_INCLUDES=/I"C:\work\open_source\sqllite\sqlite\src" /I"C:\work\open_source\sqllite\sqlite\win32"
 !IF "$(VERBOSE)" != "0"
 !MESSAGE Defaulting SQLITE_INCLUDES includes to $(SQLITE_INCLUDES).
@@ -135,7 +135,7 @@ SQLITE_LIBPATH="C:\work\open_source\sqllite\sqlite\objs"
 !ENDIF
 !ENDIF
 
-!IF "$(SQLITE_INCLUDE3)" == ""
+!IF "$(SQLITE_INCLUDES3)" == ""
 SQLITE_INCLUDES3=/I"c:\work\sqlite\generated"
 !IF "$(VERBOSE)" != "0"
 !MESSAGE Defaulting SQLITE_INCLUDES3 includes to $(SQLITE_INCLUDES3).
@@ -184,16 +184,16 @@ CODEGEN=/MD
 !ENDIF 
 
 !IF "$(VCVER)" != "6"
-ENABLE_WIN64_WARNINGS=/Wp64
+ENABLE_WIN64_WARNINGS=
 !ENDIF
 
-CPP_PROJ= $(CODEGEN) /W3 $(EXCEPTHANDLING) /O2 $(ENABLE_WIN64_WARNINGS) /Zi /D "NDEBUG" /D _CRT_SECURE_NO_DEPRECATE=1 $(CPPFLAGS) /FD /c
+CPP_PROJ= /guard:cf /Zc:inline /GF /GL /Gw $(CODEGEN) /W3 $(EXCEPTHANDLING) /Ox $(ENABLE_WIN64_WARNINGS) /Zi /D "NDEBUG" /D _CRT_SECURE_NO_DEPRECATE=1 $(CPPFLAGS) /FD /c
 
 incremental=no
 
 # This use to contain /machine:I386. This breaks cross compiling to Windows 64.
 # It doesn't seem that the /machine option is needed anyway.
-LINK32_FLAGS=/debug
+LINK32_FLAGS=/debug /GUARD:CF /opt:ref,icf /NXCOMPAT /DYNAMICBASE
 
 !ELSEIF  "$(CFG)" == "Debug"