7 files changed, 56 insertions, 14 deletions
diff --git a/plugins/ewc/makefile.mak b/plugins/ewc/makefile.mak
index a81c060e..9b9f21c1 100644
--- a/plugins/ewc/makefile.mak
+++ b/plugins/ewc/makefile.mak
@@ -1,8 +1,7 @@
 include "..\..\src\makeinc.mak"
 
-xcewc.dll: ewc.obj ewc.def
+all: ewc.obj ewc.def
 	link $(LDFLAGS) $(LIBS) /dll /out:xcewc.dll /def:ewc.def ewc.obj
-	dir xcewc.dll
 
 ewc.def:
 	echo EXPORTS > ewc.def
@@ -10,7 +9,7 @@ ewc.def:
 	echo xchat_plugin_deinit >> ewc.def
 
 ewc.obj: ewc.c makefile.mak
-	cl $(CFLAGS) /I.. ewc.c
+	cl $(CFLAGS) ewc.c
 
 clean:
 	del *.obj
diff --git a/plugins/lua/makefile.mak b/plugins/lua/makefile.mak
index 3059660d..e1ef8822 100644
--- a/plugins/lua/makefile.mak
+++ b/plugins/lua/makefile.mak
@@ -1,8 +1,7 @@
 include "..\..\src\makeinc.mak"
 
-xclua.dll: lua.obj lua.def
+all: lua.obj lua.def
 	link $(LDFLAGS) $(LIBS) /dll /out:xclua.dll /libpath:$(LUAPATH)\lib $(LUALIB).lib /def:lua.def lua.obj 
-	dir xclua.dll
 
 lua.def:
 	echo EXPORTS > lua.def
@@ -10,7 +9,7 @@ lua.def:
 	echo xchat_plugin_deinit >> lua.def
 
 lua.obj: lua.c makefile.mak
-	cl $(CFLAGS) /Dsnprintf=g_snprintf /I.. /I$(LUAPATH)\include /I.. lua.c
+	cl $(CFLAGS) /Dsnprintf=g_snprintf /I$(LUAPATH)\include lua.c
 
 clean:
 	del *.obj
diff --git a/plugins/makefile.mak b/plugins/makefile.mak
new file mode 100644
index 00000000..8a83b5a6
--- /dev/null
+++ b/plugins/makefile.mak
@@ -0,0 +1,45 @@
+all:
+	@cd ewc
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\lua
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\perl
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\python
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\tcl
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+	@cd ..\xdcc
+	@-$(MAKE) /nologo /s /f makefile.mak $@
+
+clean:
+	@del ewc\*.def
+	@del ewc\*.dll
+	@del ewc\*.exp
+	@del ewc\*.lib
+	@del ewc\*.obj
+	@del lua\*.def
+	@del lua\*.dll
+	@del lua\*.exp
+	@del lua\*.lib
+	@del lua\*.obj
+	@del perl\*.def
+	@del perl\*.dll
+	@del perl\*.exp
+	@del perl\*.lib
+	@del perl\*.obj
+	@del python\*.def
+	@del python\*.dll
+	@del python\*.exp
+	@del python\*.lib
+	@del python\*.obj
+	@del tcl\*.def
+	@del tcl\*.dll
+	@del tcl\*.exp
+	@del tcl\*.lib
+	@del tcl\*.obj
+	@del xdcc\*.def
+	@del xdcc\*.dll
+	@del xdcc\*.exp
+	@del xdcc\*.lib
+	@del xdcc\*.obj
diff --git a/plugins/perl/makefile.mak b/plugins/perl/makefile.mak
index 3d79f794..fd54f458 100644
--- a/plugins/perl/makefile.mak
+++ b/plugins/perl/makefile.mak
@@ -11,7 +11,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) -I.. -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) -I$(PERLPATH) -DPERL_DLL=\"$(PERLLIB).dll\"
 
 perl.c: xchat.pm.h
 
diff --git a/plugins/python/makefile.mak b/plugins/python/makefile.mak
index 1b71f40c..a0eb7b0c 100644
--- a/plugins/python/makefile.mak
+++ b/plugins/python/makefile.mak
@@ -11,10 +11,10 @@ python.def:
 	echo xchat_plugin_get_info >> python.def
 
 python.obj: python.c
-	$(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I.. /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
+	$(CC) $(CFLAGS) /Dusleep=_sleep /DPATH_MAX=255 python.c $(GLIB) /I$(PYTHONPATH)\include /DPYTHON_DLL=\"$(PYTHONLIB).dll\"
 
 $(TARGET): python.obj python.def
-	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(LIBS) /def:python.def
+	$(LINK) /dll /out:$(TARGET) $(LDFLAGS) python.obj /libpath:$(PYTHONPATH)\libs $(PYTHONLIB).lib $(LIBS) /def:python.def
 
 clean:
 	del $(TARGET)
diff --git a/plugins/tcl/makefile.mak b/plugins/tcl/makefile.mak
index 51d31efb..252af81b 100644
--- a/plugins/tcl/makefile.mak
+++ b/plugins/tcl/makefile.mak
@@ -11,10 +11,10 @@ tcl.def:
 	echo xchat_plugin_get_info >> tcl.def
 
 tclplugin.obj: tclplugin.c
-	$(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\include /I../../include /I.. /DTCL_DLL=\"$(TCLLIB).dll\"
+	$(CC) $(CFLAGS) tclplugin.c /I$(TCLPATH)\include /DTCL_DLL=\"$(TCLLIB).dll\"
 
 $(TARGET): tclplugin.obj tcl.def
-	$(LINK) /DLL /out:$(TARGET) $(LDFLAGS) tclplugin.obj /libpath:$(TCLPATH)\lib $(TCLLIB).lib /DELAYLOAD:$(TCLLIB).dll DELAYIMP.LIB /def:tcl.def
+	$(LINK) /dll /out:$(TARGET) $(LDFLAGS) tclplugin.obj /libpath:$(TCLPATH)\lib $(TCLLIB).lib /delayload:$(TCLLIB).dll delayimp.lib /def:tcl.def
 
 clean:
 	del $(TARGET)
diff --git a/plugins/xdcc/makefile.mak b/plugins/xdcc/makefile.mak
index 38a0735f..280d8d84 100644
--- a/plugins/xdcc/makefile.mak
+++ b/plugins/xdcc/makefile.mak
@@ -1,8 +1,7 @@
 include "..\..\src\makeinc.mak"
 
-xcxdcc.dll: xdcc.obj xdcc.def
+all: xdcc.obj xdcc.def
 	link $(LDFLAGS) $(LIBS) /dll /out:xcxdcc.dll /def:xdcc.def xdcc.obj
-	dir xcxdcc.dll
 
 xdcc.def:
 	echo EXPORTS > xdcc.def
@@ -10,7 +9,7 @@ xdcc.def:
 	echo xchat_plugin_deinit >> xdcc.def
 
 xdcc.obj: xdcc.c makefile.mak
-	cl $(CFLAGS) $(GLIB) /I.. xdcc.c
+	cl $(CFLAGS) $(GLIB) xdcc.c
 
 clean:
 	del *.obj