diff options
| author | Jose <jose@zeroc.com> | 2013-09-04 16:45:44 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-09-04 16:45:44 +0200 |
| commit | 447970612f232fde460b4fe02ba4eaf398bf49a1 (patch) | |
| tree | 5f6ae966c6b383ae763a585ae674d4fac6274f63 | |
| parent | Fixed .gitignore files (diff) | |
| download | ice-447970612f232fde460b4fe02ba4eaf398bf49a1.tar.bz2 ice-447970612f232fde460b4fe02ba4eaf398bf49a1.tar.xz ice-447970612f232fde460b4fe02ba4eaf398bf49a1.zip | |
Minor fix to core distributions
| -rw-r--r-- | Makefile.mak.core | 46 | ||||
| -rwxr-xr-x | distribution/makedist.py | 3 |
2 files changed, 2 insertions, 47 deletions
diff --git a/Makefile.mak.core b/Makefile.mak.core deleted file mode 100644 index 945dc36848b..00000000000 --- a/Makefile.mak.core +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = cpp -!include cpp/config/Make.rules.mak - -SUBDIRS = cpp -CLEAN_SUBDIRS = cpp -DEPEND_SUBDIRS = cpp -INSTALL_SUBDIRS = cpp -TEST_SUBDIRS = cpp - -all:: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making all in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1 - -clean:: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making clean in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) clean" || exit 1 - -depend:: - @for %i in ( $(DEPEND_SUBDIRS) ) do \ - @echo "making depend in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) depend" || exit 1 - -install:: - @for %i in ( $(TEST_SUBDIRS) ) do \ - @echo "making install in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) install" || exit 1 - -test:: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making test in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) test" || exit 1 - -cpp:: - @echo "making all in cpp" && \ - cmd /c "cd cpp && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1 diff --git a/distribution/makedist.py b/distribution/makedist.py index 69babef3316..664a992b356 100755 --- a/distribution/makedist.py +++ b/distribution/makedist.py @@ -395,6 +395,7 @@ fixGitAttributes(True, False, ["/distribution", "*.vcproj", "*.vcxproj", "*.vcxproj.filters", + "Makefile.core", "Make*mak*", "Make.rules.msvc", ".depend.mak", @@ -471,7 +472,7 @@ move("demoscript", os.path.join(demoscriptDir, "demoscript")) # Move the demoscr # and the associated top level demo script. move("allDemos.py", os.path.join(demoscriptDir, "demoscript", "allDemos.py")) -fixGitAttributes(True, True, ["/distribution", "/demoscript", "allDemos.py"]) +fixGitAttributes(True, True, ["/distribution", "/demoscript", "allDemos.py", "Makefile.core"]) # Don't remove Makefile from the Windows distribution since the # mingw build requires it. |