diff options
| author | Jose <jose@zeroc.com> | 2014-09-24 16:36:41 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-24 16:36:41 +0200 |
| commit | 5813f74867a47dca54bf058056443e7b6625f244 (patch) | |
| tree | 28a8996aeeb4a721e8e2eda78388c107549ed61c /cpp/src/slice2confluence | |
| parent | ICE-5689 Test for JavaScript nested modules not implemented in Java/C# (diff) | |
| download | ice-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/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 | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile.mak | 10 |
4 files changed, 3 insertions, 13 deletions
diff --git a/cpp/src/slice2confluence/.depend b/cpp/src/slice2confluence/.depend deleted file mode 100644 index c38543ac755..00000000000 --- a/cpp/src/slice2confluence/.depend +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 11ef9b46339..00000000000 --- a/cpp/src/slice2confluence/.depend.mak +++ /dev/null @@ -1,2 +0,0 @@ -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 7d9d7cbb4d8..844ef386a05 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -17,8 +17,6 @@ OBJS = ConfluenceOutput.o \ Gen.o \ Main.o -SRCS = $(OBJS:.o=.cpp) - ifeq ($(CPP11),yes) RPATH_DIR = @loader_path/../../lib/c++11 else diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index 797040e9115..ddd034046d8 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -13,11 +13,9 @@ NAME = $(top_srcdir)\bin\slice2confluence.exe TARGETS = $(NAME) -OBJS = ConfluenceOutput.obj \ - Gen.obj \ - Main.obj - -SRCS = $(OBJS:.obj=.cpp) +OBJS = .\ConfluenceOutput.obj \ + .\Gen.obj \ + .\Main.obj !include $(top_srcdir)/config/Make.rules.mak @@ -49,5 +47,3 @@ install:: all copy $(NAME:.exe=.pdb) "$(install_bindir)" !endif - -!include .depend.mak |