Fix (ICE-3792) - dependencies in the repository are very crappy

For now removed Unix dependencies from repository, we keep Windows
dependencies in repository but now are generated from Windows.

4 files changed, 38 insertions, 11 deletions

diff --git a/cpp/src/slice2py/.depend b/cpp/src/slice2py/.depend
deleted file mode 100644
index b9a8a3901f7..00000000000
--- a/cpp/src/slice2py/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/StringConverter.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/UniquePtr.h $(includedir)/IceUtil/IconvStringConverter.h $(includedir)/IceUtil/UndefSysMacros.h $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/StringUtil.h $(includedir)/Slice/Preprocessor.h $(includedir)/Slice/FileTracker.h $(includedir)/Slice/Parser.h $(includedir)/Slice/PythonUtil.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Util.h
diff --git a/cpp/src/slice2py/.depend.mak b/cpp/src/slice2py/.depend.mak
index 6476f905c04..cb275a4ea03 100644
--- a/cpp/src/slice2py/.depend.mak
+++ b/cpp/src/slice2py/.depend.mak
@@ -1 +1,37 @@
-Main$(OBJEXT): Main.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(includedir)/IceUtil/IceUtil.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/AbstractMutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/Cache.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/CountDownLatch.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/CtrlCHandler.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/MutexPtrLock.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/StringConverter.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/UUID.h" "$(includedir)/IceUtil/UniquePtr.h" "$(includedir)/IceUtil/IconvStringConverter.h" "$(includedir)/IceUtil/UndefSysMacros.h" "$(includedir)/IceUtil/Options.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/Slice/Preprocessor.h" "$(includedir)/Slice/FileTracker.h" "$(includedir)/Slice/Parser.h" "$(includedir)/Slice/PythonUtil.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Util.h"
+
+Main.obj: \
+	Main.cpp \
+    "$(includedir)\IceUtil\DisableWarnings.h" \
+    "$(includedir)\IceUtil\IceUtil.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\AbstractMutex.h" \
+    "$(includedir)\IceUtil\Lock.h" \
+    "$(includedir)\IceUtil\ThreadException.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\Time.h" \
+    "$(includedir)\IceUtil\Cache.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Mutex.h" \
+    "$(includedir)\IceUtil\MutexProtocol.h" \
+    "$(includedir)\IceUtil\CountDownLatch.h" \
+    "$(includedir)\IceUtil\Cond.h" \
+    "$(includedir)\IceUtil\CtrlCHandler.h" \
+    "$(includedir)\IceUtil\Functional.h" \
+    "$(includedir)\IceUtil\Monitor.h" \
+    "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\IceUtil\RecMutex.h" \
+    "$(includedir)\IceUtil\ScopedArray.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\StringConverter.h" \
+    "$(includedir)\IceUtil\Thread.h" \
+    "$(includedir)\IceUtil\Timer.h" \
+    "$(includedir)\IceUtil\UUID.h" \
+    "$(includedir)\IceUtil\UniquePtr.h" \
+    "$(includedir)\IceUtil\Options.h" \
+    "$(includedir)\IceUtil\StringUtil.h" \
+    "$(includedir)\Slice\Preprocessor.h" \
+    "$(includedir)\Slice\FileTracker.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\Slice\PythonUtil.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile
index 7a0c34ad22e..8af6e8bb382 100644
--- a/cpp/src/slice2py/Makefile
+++ b/cpp/src/slice2py/Makefile
@@ -15,8 +15,6 @@ TARGETS		= $(NAME)
 
 OBJS		= Main.o
 
-SRCS		= $(OBJS:.o=.cpp)
-
 ifeq ($(CPP11),yes)
 RPATH_DIR	= @loader_path/../../lib/c++11
 else
@@ -34,5 +32,3 @@ $(NAME): $(OBJS)
 install:: all
 	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
 	$(call installdata,$(top_srcdir)/../man/man1/slice2py.1,$(DESTDIR)$(install_mandir))
-
-include .depend
diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak
index 1511a1e26d2..43d0bd47f2a 100644
--- a/cpp/src/slice2py/Makefile.mak
+++ b/cpp/src/slice2py/Makefile.mak
@@ -13,9 +13,7 @@ NAME		= $(top_srcdir)\bin\slice2py.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
+OBJS		= .\Main.obj
 
 !include $(top_srcdir)/config/Make.rules.mak
 
@@ -46,5 +44,3 @@ install:: all
 	copy $(NAME:.exe=.pdb) "$(install_bindir)"
 
 !endif
-
-!include .depend.mak