Added fix for bug #1275 where acl or xattr data is saved for virtual filenames genera...

[bacula/bacula] / bacula / src / win32 / console / Makefile

diff --git a/bacula/src/win32/console/Makefile b/bacula/src/win32/console/Makefile
index 8b6f5f5e9ff23da41a28fcb0869bf0513d74e9d1..4dc0e2e95a97fd72af2d9947f9d1b39d97a6deeb 100644 (file)
--- a/bacula/src/win32/console/Makefile
+++ b/bacula/src/win32/console/Makefile
@@ -16,7 +16,8 @@ DEFINES = \
        -DUSING_DLL \
        $(HAVES)
 
-VPATH = ../../console
+vpath %.c $(MAINDIR)/src/console
+vpath %.cpp $(MAINDIR)/src/console
 
 ##########################################################################
 
@@ -27,8 +28,7 @@ CONSOLE_OBJS = \
 
 ALL_OBJS = $(CONSOLE_OBJS)
 
-CONSOLE_LIBS = \
-       -lwsock32
+CONSOLE_LIBS = $(LIBS_NETWORK) 
 
 ######################################################################
 
@@ -42,12 +42,13 @@ clean:
        @echo "Cleaning `pwd`"
        $(call clean_obj,$(ALL_OBJS))
        $(call clean_exe,$(BINDIR)/bconsole.exe)
+       $(ECHO_CMD)rm -rf $(OBJDIRS)
 
 #
 # Rules
 #
 
 $(BINDIR)/bconsole.exe: $(CONSOLE_OBJS) $(LIBS_BACULA)
-       $(call link_winapp,$(CONSOLE_LIBS))
+       $(call link_conapp,$(CONSOLE_LIBS))
 
 include ../Makefile.rules