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/slice2confluence | |
| 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/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/.depend | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/.depend.mak | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile | 3 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile.mak | 4 |
4 files changed, 11 insertions, 0 deletions
diff --git a/cpp/src/slice2confluence/.depend b/cpp/src/slice2confluence/.depend new file mode 100644 index 00000000000..c38543ac755 --- /dev/null +++ b/cpp/src/slice2confluence/.depend @@ -0,0 +1,2 @@ +Gen$(OBJEXT): Gen.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/StringUtil.h $(includedir)/Slice/FileTracker.h $(includedir)/IceUtil/Shared.h $(includedir)/Slice/Parser.h Gen.h $(includedir)/IceUtil/OutputUtil.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 diff --git a/cpp/src/slice2confluence/.depend.mak b/cpp/src/slice2confluence/.depend.mak new file mode 100644 index 00000000000..11ef9b46339 --- /dev/null +++ b/cpp/src/slice2confluence/.depend.mak @@ -0,0 +1,2 @@ +Gen$(OBJEXT): Gen.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/Slice/FileTracker.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/Slice/Parser.h" Gen.h "$(includedir)/IceUtil/OutputUtil.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 diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index f108fdf58ec..7d9d7cbb4d8 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -17,6 +17,8 @@ OBJS = ConfluenceOutput.o \ Gen.o \ Main.o +SRCS = $(OBJS:.o=.cpp) + ifeq ($(CPP11),yes) RPATH_DIR = @loader_path/../../lib/c++11 else @@ -34,3 +36,4 @@ $(NAME): $(OBJS) install:: all $(call installprogram,$(NAME),$(DESTDIR)$(install_bindir)) +include .depend diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index 680e8ba3cdb..797040e9115 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -17,6 +17,8 @@ OBJS = ConfluenceOutput.obj \ Gen.obj \ Main.obj +SRCS = $(OBJS:.obj=.cpp) + !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN @@ -47,3 +49,5 @@ install:: all copy $(NAME:.exe=.pdb) "$(install_bindir)" !endif + +!include .depend.mak |