diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-12-02 18:16:47 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-02 18:16:47 +0100 |
commit | 0c05d30a93ee456cba4e97a6402981500f1f773b (patch) | |
tree | aa98da2ea83173473e1cf5b0c209e00245b02c7b /cpp/src | |
parent | Fixed (ICE-6045) - IceDiscovery doesn't include AssemblyInfo (diff) | |
download | ice-0c05d30a93ee456cba4e97a6402981500f1f773b.tar.bz2 ice-0c05d30a93ee456cba4e97a6402981500f1f773b.tar.xz ice-0c05d30a93ee456cba4e97a6402981500f1f773b.zip |
Fixed for testicedist.py to only test supported language mappings for a given compiler, other minor clean fixes
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/IceDiscovery/Makefile.mak | 2 | ||||
-rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceDiscovery/Makefile.mak b/cpp/src/IceDiscovery/Makefile.mak index 5e55aa3eb6c..041f4893c91 100644 --- a/cpp/src/IceDiscovery/Makefile.mak +++ b/cpp/src/IceDiscovery/Makefile.mak @@ -49,7 +49,7 @@ IceDiscovery.h IceDiscovery.cpp: $(slicedir)\IceDiscovery\IceDiscovery.ice "$(SL "$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(slicedir)\IceDiscovery\IceDiscovery.ice clean:: - -del /q IceDiscovery.cpp $(HDIR)\IceDiscovery.h + -del /q IceDiscovery.cpp IceDiscovery.h -del /q IceDiscovery.res install:: all diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index f0de51cb421..d83b611d97b 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -158,7 +158,7 @@ clean:: -del /q V32FormatDB.cpp V31FormatDB.cpp V32FormatDB.h V31FormatDB.h -del /q $(ADMIN:.exe=.*) -del /q $(MIGRATE:.exe=.*) - -del /q IceStormAdmin.res IceStormDB.res IceStormService.res + -del /q IceStormAdmin.res IceStormMigrate.res IceStormService.res install:: all copy $(LIBNAME) "$(install_libdir)" |