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, 44 insertions, 14 deletions

diff --git a/cpp/src/slice2java/.depend b/cpp/src/slice2java/.depend
deleted file mode 100644
index 12d6ec54f50..00000000000
--- a/cpp/src/slice2java/.depend
+++ /dev/null
@@ -1,2 +0,0 @@
-Gen$(OBJEXT): Gen.cpp $(includedir)/IceUtil/DisableWarnings.h Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Slice/JavaUtil.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/StringUtil.h $(includedir)/IceUtil/InputUtil.h
-Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/Slice/Preprocessor.h $(includedir)/Slice/FileTracker.h $(includedir)/Slice/Parser.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/OutputUtil.h Gen.h $(includedir)/Slice/JavaUtil.h $(includedir)/Slice/Checksum.h
diff --git a/cpp/src/slice2java/.depend.mak b/cpp/src/slice2java/.depend.mak
index 9567096283b..5a5d3d88585 100644
--- a/cpp/src/slice2java/.depend.mak
+++ b/cpp/src/slice2java/.depend.mak
@@ -1,2 +1,42 @@
-Gen$(OBJEXT): Gen.cpp "$(includedir)/IceUtil/DisableWarnings.h" Gen.h "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Slice/JavaUtil.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Checksum.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/IceUtil/InputUtil.h"
-Main$(OBJEXT): Main.cpp "$(includedir)/IceUtil/Options.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/CtrlCHandler.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/MutexPtrLock.h" "$(includedir)/Slice/Preprocessor.h" "$(includedir)/Slice/FileTracker.h" "$(includedir)/Slice/Parser.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/OutputUtil.h" Gen.h "$(includedir)/Slice/JavaUtil.h" "$(includedir)/Slice/Checksum.h"
+
+Gen.obj: \
+	Gen.cpp \
+    "$(includedir)\IceUtil\DisableWarnings.h" \
+    "..\..\src\slice2java\Gen.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\Slice\JavaUtil.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "$(includedir)\Slice\Checksum.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\IceUtil\Functional.h" \
+    "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\IceUtil\StringUtil.h" \
+    "$(includedir)\IceUtil\InputUtil.h" \
+
+Main.obj: \
+	Main.cpp \
+    "$(includedir)\IceUtil\Options.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\RecMutex.h" \
+    "$(includedir)\IceUtil\Lock.h" \
+    "$(includedir)\IceUtil\ThreadException.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\Time.h" \
+    "$(includedir)\IceUtil\MutexProtocol.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\CtrlCHandler.h" \
+    "$(includedir)\IceUtil\Mutex.h" \
+    "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Slice\Preprocessor.h" \
+    "$(includedir)\Slice\FileTracker.h" \
+    "$(includedir)\Slice\Parser.h" \
+    "$(includedir)\Slice\Util.h" \
+    "$(includedir)\IceUtil\OutputUtil.h" \
+    "..\..\src\slice2java\Gen.h" \
+    "$(includedir)\Slice\JavaUtil.h" \
+    "$(includedir)\Slice\Checksum.h" \
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 023295f65b2..75e03f8f23c 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -16,8 +16,6 @@ TARGETS		= $(NAME)
 OBJS		= Gen.o \
 		  Main.o
 
-SRCS		= $(OBJS:.o=.cpp)
-
 ifeq ($(CPP11),yes)
 RPATH_DIR	= @loader_path/../../lib/c++11
 else
@@ -35,5 +33,3 @@ $(NAME): $(OBJS)
 install:: all
 	$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
 	$(call installdata,$(top_srcdir)/../man/man1/slice2java.1,$(DESTDIR)$(install_mandir))
-
-include .depend
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak
index ec7060db497..2edaa9e9a92 100644
--- a/cpp/src/slice2java/Makefile.mak
+++ b/cpp/src/slice2java/Makefile.mak
@@ -13,10 +13,8 @@ NAME		= $(top_srcdir)\bin\slice2java.exe
 
 TARGETS		= $(NAME)
 
-OBJS		= Gen.obj \
-		  Main.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
+OBJS		= .\Gen.obj \
+		  .\Main.obj
 
 !include $(top_srcdir)/config/Make.rules.mak
 
@@ -48,5 +46,3 @@ install:: all
 	copy $(NAME:.exe=.pdb) "$(install_bindir)"
 
 !endif
-
-!include .depend.mak