Imported Upstream version 3.0.0upstream/3.0.0

1 files changed, 9 insertions, 14 deletions

diff --git a/util/ipmiutil.mak b/util/ipmiutil.mak
index 5ead440..9d63953 100644
--- a/util/ipmiutil.mak
+++ b/util/ipmiutil.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) 

@@ -58,7 +58,6 @@ MKLIB=lib
 RM=del

 CP=copy

 

-#   added ws2_32.lib 

 LIBS_EX  = advapi32.lib kernel32.lib wsock32.lib ws2_32.lib $(LIBS_W) $(LIBC_RT)

 LIBS_PEF = /LIBPATH:$(LIB_D) iphlpapi.lib

 # LIBS_EX+=wsock32.lib user32.lib gdi32.lib 

@@ -67,7 +66,7 @@ HEADER=ipmicmd.h imb_api.h ipmilan.h ipmidir.h ipmilanplus.h \
        ipmiutil.h 

 

 SHOWSEL = showsel

-TARG_EXE=ievents.exe $(SHOWSEL)msg.dll ipmi_sample.exe ipmi_sample_evt.exe $(SAMP_DLL)

+TARG_EXE=ievents.exe $(SHOWSEL)msg.dll ipmi_sample.exe ipmi_sample2.exe ipmi_sample_evt.exe $(SAMP_DLL)

 #  alarms.exe ihealth.exe $(SHOWSEL).exe $(SHOWSEL)msg.dll \

 #  ireset.exe ifru.exe ilan.exe iserial.exe wdt.exe \

 #  getevent.exe sensor.exe icmd.exe isolconsole.exe idiscover.exe \

@@ -120,14 +119,12 @@ clean:
 	$(RM) $(TARG_EXE) 2>NUL

 	$(RM) *.exe 2>NUL

 	-$(RM) $(TMP_D)\*.obj 2>NUL

-	-$(RM) *.manifest 2>NUL

 

 distclean:

 	$(RM) *.obj 2>NUL

 	$(RM) $(TARG_EXE) 2>NUL

 	$(RM) *.exe 2>NUL

 	-$(RM) $(TMP_D)\*.* 2>NUL

-	-$(RM) *.manifest 2>NUL

 	rmdir $(TMP_D) 2>NUL

 	$(RM) *.rc 2>NUL

 	$(RM) *.bin 2>NUL

@@ -389,8 +386,6 @@ $(TMP_D)\iwdt.obj:    iwdt.c
 

 $(E_EXE):  $(E_OBJ) 

   $(LINK) $(LFLAGS) /OUT:$(E_EXE) $(E_OBJ) $(LF_LANPLUS) $(LIBS_PEF) $(LIBS_EX) 

-  

-#  mt.exe -manifest $(E_EXE).manifest -outputresource:$(E_EXE);1

 

 ipmi_sample.obj:    ipmi_sample.c

     $(CC) /c $(CFLAGS_SAM) ipmi_sample.c

@@ -402,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

@@ -431,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)