diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-02-20 14:27:41 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-02-20 14:27:41 +0100 |
| commit | af1544e7b81e8708c5fdee05a59328558a3030fe (patch) | |
| tree | 0933eb39159b8cf714aab7fe5901d0515674d7c6 /cpp/src/IceGrid | |
| parent | Simplification to Atomic usage (diff) | |
| download | ice-af1544e7b81e8708c5fdee05a59328558a3030fe.tar.bz2 ice-af1544e7b81e8708c5fdee05a59328558a3030fe.tar.xz ice-af1544e7b81e8708c5fdee05a59328558a3030fe.zip | |
Fix for ICE-6268, initialize enum, string and structs in Java/C#/Objective-C/JavaScript
Diffstat (limited to 'cpp/src/IceGrid')
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 90292dcb1c1..0fcb6e7e453 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -121,8 +121,7 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS) $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStorm -lIceStormService -lIceBox -lGlacier2 \ -lFreeze -lIcePatch2 $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_RPATH_LINK) $(LIBS) -../IceGrid/IceLocatorDiscovery.h IceLocatorDiscovery.cpp: \ - $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice $(SLICE2CPP) $(SLICEPARSERLIB) +../IceLocatorDiscovery/%.h %.cpp: $(slicedir)/IceLocatorDiscovery/%.ice $(SLICE2CPP) $(SLICEPARSERLIB) rm -f $(*F).h $(*F).cpp $(SLICE2CPP) $(SLICE2CPPFLAGS) $(slicedir)/IceLocatorDiscovery/$(*F).ice @touch $(*F).cpp |