summaryrefslogtreecommitdiff
path: root/cpp/src/slice2rb
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-09-24 16:36:41 +0200
committerJose <jose@zeroc.com>2014-09-24 16:36:41 +0200
commit5813f74867a47dca54bf058056443e7b6625f244 (patch)
tree28a8996aeeb4a721e8e2eda78388c107549ed61c /cpp/src/slice2rb
parentICE-5689 Test for JavaScript nested modules not implemented in Java/C# (diff)
downloadice-5813f74867a47dca54bf058056443e7b6625f244.tar.bz2
ice-5813f74867a47dca54bf058056443e7b6625f244.tar.xz
ice-5813f74867a47dca54bf058056443e7b6625f244.zip
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.
Diffstat (limited to 'cpp/src/slice2rb')
-rw-r--r--cpp/src/slice2rb/.depend1
-rw-r--r--cpp/src/slice2rb/.depend.mak24
-rw-r--r--cpp/src/slice2rb/Makefile4
-rw-r--r--cpp/src/slice2rb/Makefile.mak6
4 files changed, 24 insertions, 11 deletions
diff --git a/cpp/src/slice2rb/.depend b/cpp/src/slice2rb/.depend
deleted file mode 100644
index a2d6cddbd1b..00000000000
--- a/cpp/src/slice2rb/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/DisableWarnings.h $(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/RubyUtil.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Util.h
diff --git a/cpp/src/slice2rb/.depend.mak b/cpp/src/slice2rb/.depend.mak
index ab6dca6a966..a5b6f529965 100644
--- a/cpp/src/slice2rb/.depend.mak
+++ b/cpp/src/slice2rb/.depend.mak
@@ -1 +1,23 @@
-Main$(OBJEXT): Main.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(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/RubyUtil.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Util.h"
+
+Main.obj: \
+ Main.cpp \
+ "$(includedir)\IceUtil\DisableWarnings.h" \
+ "$(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\RubyUtil.h" \
+ "$(includedir)\IceUtil\OutputUtil.h" \
+ "$(includedir)\Slice\Util.h" \
diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile
index a5973da8b45..192c0db10c7 100644
--- a/cpp/src/slice2rb/Makefile
+++ b/cpp/src/slice2rb/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/slice2rb.1,$(DESTDIR)$(install_mandir))
-
-include .depend
diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak
index fa773e01bbd..d2e8913c55a 100644
--- a/cpp/src/slice2rb/Makefile.mak
+++ b/cpp/src/slice2rb/Makefile.mak
@@ -13,9 +13,7 @@ NAME = $(top_srcdir)\bin\slice2rb.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