Fix makefile rules for building dll-s in Makefile.win32 files

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 1fe4c6ecf2643ae6851f7da0c5d7f684037faeae..8a1192fce25d85b29c04e8540abc5701c381f2f7 100644 (file)
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -170,7 +170,7 @@ LD=link.exe
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(EXPAT_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-       $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+       $(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-       $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE)
+       $(CC) $(CC_FLAGS) -c -Fo$@ $<

diff --git a/src/ejabberd_zlib/Makefile.win32 b/src/ejabberd_zlib/Makefile.win32
index c13383fa83e39a09e922ae94d33e11c6fe0f2c33..0041df83cc1eee201a3f0699a35076e683ac2223 100644 (file)
--- a/src/ejabberd_zlib/Makefile.win32
+++ b/src/ejabberd_zlib/Makefile.win32
@@ -29,8 +29,8 @@ LD=link.exe
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(ZLIB_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-       $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+       $(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-       $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) 
+       $(CC) $(CC_FLAGS) -c -Fo$@ $<
 

diff --git a/src/mod_irc/Makefile.win32 b/src/mod_irc/Makefile.win32
index 9c22f43f1097d21ad9f301f4ebe62f66476b67e8..fb0671104eea8d3bd2002c150e7b6a8166089eae 100644 (file)
--- a/src/mod_irc/Makefile.win32
+++ b/src/mod_irc/Makefile.win32
@@ -35,8 +35,8 @@ LD=link.exe
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(ICONV_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-       $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+       $(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-       $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) 
+       $(CC) $(CC_FLAGS) -c -Fo$@ $<
 

diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32
index 60ccb416c602d9b9058a67bf43fe4d2ff70d5d11..b044a105d3a7b8e97eab25c065614af732c1e23e 100644 (file)
--- a/src/stringprep/Makefile.win32
+++ b/src/stringprep/Makefile.win32
@@ -33,8 +33,8 @@ LD=link.exe
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-       $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+       $(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE) $(AUXIL)
-       $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) 
+       $(CC) $(CC_FLAGS) -c -Fo$@ $<
 

diff --git a/src/tls/Makefile.win32 b/src/tls/Makefile.win32
index b982791e2ef03058e091842365de4ad45bdcc5e8..f5a3dba05b899645ca47d0e648834a9d0126eace 100644 (file)
--- a/src/tls/Makefile.win32
+++ b/src/tls/Makefile.win32
@@ -31,8 +31,8 @@ LD=link.exe
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(OPENSSL_DIR)\lib\VC\ssleay32MD.lib" "$(OPENSSL_DIR)\lib\VC\libeay32MD.lib" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-       $(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+       $(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-       $(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) 
+       $(CC) $(CC_FLAGS) -c -Fo$@ $<