make Makefile more easily portable to win32

Change-Id: Ieb49fbc72b37541ee543c7d6bb0352ed1f143438

diff --git a/Makefile b/Makefile
index e833f60..650b88c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,11 @@ LUPD=lupdate
 LREL=lrelease
 XPAT=xmlpatterns
 
+#basic commands
+COPY=cp -af
+COPYREC=cp -raf
+MKDIR=mkdir -p
+
 ###########################################################
 # END OF CONFIGURATION
 # No user editable content below this line
@@ -99,7 +104,7 @@ wbase: woc
 server: wob
 
 client: wob taurus tzone wbase
-       mkdir -p bin
+       -$(MKDIR) bin
        cd iface && $(QMAKE) $(QMAKEFLAGS) && $(MAKE)
        cd commonlib && $(QMAKE) $(QMAKEFLAGS) && $(MAKE)
        cd sesscli && $(QMAKE) $(QMAKEFLAGS) && $(MAKE)
@@ -109,18 +114,23 @@ client: wob taurus tzone wbase
        cd adminapp && $(QMAKE) $(QMAKEFLAGS) && $(MAKE)
        cd plugins && $(QMAKE) $(QMAKEFLAGS) && $(MAKE)
 
+winclient: COPY=copy /y
+winclient: MKDIR=mkdir
+winclient: COPYREC=xcopy /q /s /e /h /y
+winclient: client
+
 taurus:
-       -mkdir -p bin
+       -$(MKDIR) bin
        cd taurus && $(QMAKE) $(QMCFG) $(QMAKEFLAGS) && $(MAKE)
-       cp -a taurus/lib/* bin/
-       -cp -a taurus/aurora/gpg/bin/gpg bin/
-       -cp -a taurus/aurora/gpg/bin/gpg.exe bin/
-       -cp -a taurus/aurora/gpg/lib/* bin/
+       $(COPY) taurus/lib/* bin/
+       -$(COPY) taurus/aurora/gpg/bin/gpg bin/
+       -$(COPY) taurus/aurora/gpg/bin/gpg.exe bin/
+       -$(COPY) taurus/aurora/gpg/lib/* bin/
 
 tzone:
-       -mkdir -p bin
+       -$(MKDIR) bin
        cd tzone && $(QMAKE) $(QMCFG) $(QMAKEFLAGS) && $(MAKE)
-       cp -a tzone/libQtTz* bin/
+       $(COPY) tzone/libQtTz* bin/
 
 sdoc:
        $(DOXYGEN) Doxyfile-php

diff --git a/taurus b/taurus
index a920ea2..13999e1 160000 (submodule)
--- a/taurus
+++ b/taurus
@@ -1 +1 @@
-Subproject commit a920ea2cb350fe9191735b7beb782067a82bacf9
+Subproject commit 13999e1f8f8a5f7ccd6b01db53c4097ae0b1b214

diff --git a/tzone b/tzone
index 2e5d1ea..d2852c3 160000 (submodule)
--- a/tzone
+++ b/tzone
@@ -1 +1 @@
-Subproject commit 2e5d1ea7319bd0672770001170d0c9e81095e1a6
+Subproject commit d2852c3d8f78d0ae39e2a0833e33c3551e89cea0