From db5e8f26947114f06480dd22b9db7e22e50ee133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 24 Aug 2016 05:56:37 +0200
Subject: Imported Upstream version 3.0.0

---
 util/ipmiutil64.mak | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'util/ipmiutil64.mak')

diff --git a/util/ipmiutil64.mak b/util/ipmiutil64.mak
index adb06a2..45e1bec 100644
--- a/util/ipmiutil64.mak
+++ b/util/ipmiutil64.mak
@@ -26,7 +26,7 @@ CMD_OBJ = $(CMD_OBJ) ipmilanplus.obj
 L2_OBJ = $(L2_D)\helper.obj $(L2_D)\ipmi_strings.obj $(L2_D)\lanplus.obj \
 	$(L2_D)\lanplus_crypt_impl.obj $(L2_D)\lanplus_dump.obj \
 	$(L2_D)\lanplus_strings.obj $(L2_D)\lanplus_crypt.obj
-LF_LANPLUS=/LIBPATH:$(LIB_D) $(L2_OBJ) ssleay32.lib libeay32.lib 
+LF_LANPLUS=/LIBPATH:$(LIB_D) /LIBPATH:$(L2_D) $(L2_OBJ) ssleay32.lib libeay32.lib 
 CF_LANPLUS=/D HAVE_LANPLUS
 
 # Set your compiler options
@@ -36,7 +36,7 @@ CF_LANPLUS=/D HAVE_LANPLUS
 # CFLAGS_O=/W3 /O2 /Zi /MT /nologo 
 CFLAGS_O=/W3 /O2 /Zi /MT /nologo
 CF_EX=/DWIN32 $(CF_LANPLUS) $(INC) /D_CONSOLE /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DHAVE_STRING_H
-CF_SAM=/DWIN32 $(INC) /D_CONSOLE /D_CRT_SECURE_NO_DEPRECATE /DHAVE_STRING_H
+CF_SAM=/DWIN32 $(INC) /D_CONSOLE /D_CRT_SECURE_NO_DEPRECATE /DHAVE_STRING_H $(CF_LANPLUS)
 CFLAGS=$(CFLAGS_O) $(CF_EX) /DSKIP_MD2
 CFLAGS_M=$(CFLAGS_O) $(CF_EX) /DSKIP_MD2 /DMETACOMMAND
 CFLAGS_SAM=$(CFLAGS_O) $(CF_SAM) 
@@ -397,24 +397,24 @@ $(SAMP_LIB):    $(CMD_OBJ) mem_if.obj
 
 $(SAMP_DLL):    $(CMD_OBJ) mem_if.obj
     $(CC) /D_WINDLL /D_USRDLL /c $(CFLAGS_SAM) ipmilanplus.c
-    $(LINK) /DLL $(LFLAGS) /OUT:$(SAMP_DLL) /def:ipmiutillib.def $(CMD_OBJ) mem_if.obj $(LIBS_PEF) $(LIBS_EX) 
+    $(LINK) /DLL $(LFLAGS) /OUT:$(SAMP_DLL) /def:ipmiutillib.def $(CMD_OBJ) mem_if.obj $(LIBS_PEF) $(LF_LANPLUS) $(LIBS_EX) 
     del ipmilanplus.obj
 
 ipmi_sample.exe:  $(SAMP_LIB) ipmi_sample.obj
-    $(LINK) $(LFLAGS) /OUT:ipmi_sample.exe ipmi_sample.obj $(SAMP_LIB) $(LIBS_PEF) $(LIBS_EX) 
+    $(LINK) $(LFLAGS) /OUT:ipmi_sample.exe ipmi_sample.obj $(SAMP_LIB) $(LIBS_PEF) $(LF_LANPLUS) $(LIBS_EX) 
 
 ipmi_sample2.exe:  $(SAMP_LIB) ipmi_sample.c isensor.c ievents.c
     $(CC) /c $(CFLAGS_SAM) /DGET_SENSORS ipmi_sample.c
     $(CC) /c $(CFLAGS_SAM) isensor.c
     $(CC) /c $(CFLAGS_SAM) ievents.c
-    $(LINK) $(LFLAGS) /OUT:ipmi_sample2.exe ipmi_sample.obj isensor.obj ievents.obj $(SAMP_LIB) $(LIBS_PEF) $(LIBS_EX) 
-    del isensor.obj ievents.obj
+    $(LINK) $(LFLAGS) /OUT:ipmi_sample2.exe ipmi_sample.obj isensor.obj ievents.obj $(SAMP_LIB) $(LIBS_PEF) $(LF_LANPLUS)  $(LIBS_EX)
+    del isensor.obj ievents.obj ipmi_sample.obj
 
 ifruset.obj:	ifruset.c
 	$(CC) /c $(CFLAGS_SAM) ifruset.c
 
 ifruset.exe:	$(SAMP_LIB) ifruset.obj  ifru_picmg.obj
-	$(LINK) $(LFLAGS) /OUT:ifruset.exe ifruset.obj ifru_picmg.obj $(SAMP_LIB) $(LIBS_PEF) $(LIBS_EX)
+	$(LINK) $(LFLAGS) /OUT:ifruset.exe ifruset.obj ifru_picmg.obj $(SAMP_LIB) $(LIBS_PEF) $(LF_LANPLUS) $(LIBS_EX) 
 
 ipmi_sample_evt.obj:    ipmi_sample_evt.c $(HEADER)
         $(CC) /c $(CFLAGS_SAM) ipmi_sample_evt.c
@@ -426,5 +426,5 @@ ievents2.obj:    ievents.c ievents.h $(HEADER)
         $(CC) /c /Foievents2.obj $(CFLAGS_SAM) /DSENSORS_OK ievents.c
 
 ipmi_sample_evt.exe:  $(SAMP_LIB) ipmi_sample_evt.obj ievents2.obj isensor2.obj
-        $(LINK) $(LFLAGS) /OUT:ipmi_sample_evt.exe ipmi_sample_evt.obj ievents2.obj isensor2.obj $(SAMP_LIB) $(LIBS_PEF) $(LIBS_EX) 
+        $(LINK) $(LFLAGS) $(LF_LANPLUS) /OUT:ipmi_sample_evt.exe ipmi_sample_evt.obj ievents2.obj isensor2.obj $(SAMP_LIB) $(LIBS_PEF) $(LIBS_EX)
 
-- 
cgit v1.2.3