diff options
| author | Jose <jose@zeroc.com> | 2014-09-10 17:36:20 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-10 17:36:20 +0200 |
| commit | 00dbbdfaeae1af7d7457329641bb0cf6e726ba3c (patch) | |
| tree | a658e21567cf3227ad52d948627fae5db1946140 /cpp/src/slice2rb | |
| parent | ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networki... (diff) | |
| download | ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.tar.bz2 ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.tar.xz ice-00dbbdfaeae1af7d7457329641bb0cf6e726ba3c.zip | |
Fixed (ICE-3792) - dependencies in the repository are very crappy
Diffstat (limited to 'cpp/src/slice2rb')
| -rw-r--r-- | cpp/src/slice2rb/.depend | 1 | ||||
| -rw-r--r-- | cpp/src/slice2rb/.depend.mak | 1 | ||||
| -rw-r--r-- | cpp/src/slice2rb/Main.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2rb/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/slice2rb/Makefile.mak | 4 |
5 files changed, 1 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 deleted file mode 100644 index ab6dca6a966..00000000000 --- a/cpp/src/slice2rb/.depend.mak +++ /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/Main.cpp b/cpp/src/slice2rb/Main.cpp index 83f2da8a9c0..5b59e80ba2d 100644 --- a/cpp/src/slice2rb/Main.cpp +++ b/cpp/src/slice2rb/Main.cpp @@ -210,7 +210,7 @@ compile(int argc, char* argv[]) return EXIT_FAILURE; } - if(!icecpp->printMakefileDependencies(Preprocessor::Ruby, includePaths, + if(!icecpp->printMakefileDependencies(Preprocessor::Ruby, output, includePaths, "-D__SLICE2RB__")) { return EXIT_FAILURE; 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..86f80521d93 100644 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -15,8 +15,6 @@ TARGETS = $(NAME) OBJS = Main.obj -SRCS = $(OBJS:.obj=.cpp) - !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN @@ -46,5 +44,3 @@ install:: all copy $(NAME:.exe=.pdb) "$(install_bindir)" !endif - -!include .depend.mak |