diff options
| author | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-11 17:38:07 +0200 |
| commit | c23959aa7a6bb1f81f1834fd68aed48962fd6e2e (patch) | |
| tree | a1d14ec52574508a3e9e3492462c3a845e0912e7 /cpp/src/slice2rb | |
| parent | Fix dependencies causing C++ rebuilds (diff) | |
| download | ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.bz2 ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.tar.xz ice-c23959aa7a6bb1f81f1834fd68aed48962fd6e2e.zip | |
Revert "Fixed (ICE-3792) - dependencies in the repository are very crappy"
This reverts commit 201d395c7186e50d195672db7b472989783826cb.
Conflicts:
cpp/config/Make.rules
cpp/test/Ice/Makefile.mak
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, 11 insertions, 1 deletions
diff --git a/cpp/src/slice2rb/.depend b/cpp/src/slice2rb/.depend new file mode 100644 index 00000000000..a2d6cddbd1b --- /dev/null +++ b/cpp/src/slice2rb/.depend @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..ab6dca6a966 --- /dev/null +++ b/cpp/src/slice2rb/.depend.mak @@ -0,0 +1 @@ +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 5b59e80ba2d..83f2da8a9c0 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, output, includePaths, + if(!icecpp->printMakefileDependencies(Preprocessor::Ruby, includePaths, "-D__SLICE2RB__")) { return EXIT_FAILURE; diff --git a/cpp/src/slice2rb/Makefile b/cpp/src/slice2rb/Makefile index 192c0db10c7..a5973da8b45 100644 --- a/cpp/src/slice2rb/Makefile +++ b/cpp/src/slice2rb/Makefile @@ -15,6 +15,8 @@ TARGETS = $(NAME) OBJS = Main.o +SRCS = $(OBJS:.o=.cpp) + ifeq ($(CPP11),yes) RPATH_DIR = @loader_path/../../lib/c++11 else @@ -32,3 +34,5 @@ $(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 86f80521d93..fa773e01bbd 100644 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -15,6 +15,8 @@ TARGETS = $(NAME) OBJS = Main.obj +SRCS = $(OBJS:.obj=.cpp) + !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN @@ -44,3 +46,5 @@ install:: all copy $(NAME:.exe=.pdb) "$(install_bindir)" !endif + +!include .depend.mak |