diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-10-26 12:23:30 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-10-26 12:23:30 +0000 |
| commit | d2ff37d24068248ef66a1e8c61789852ad1296ae (patch) | |
| tree | 575f7813f335ed223b24affd87421dddecca91a4 /cpp/src | |
| parent | Renamed IceStorm::subscribe to IceStorm::Topic::subscribeAndGetPublisher. (diff) | |
| download | ice-d2ff37d24068248ef66a1e8c61789852ad1296ae.tar.bz2 ice-d2ff37d24068248ef66a1e8c61789852ad1296ae.tar.xz ice-d2ff37d24068248ef66a1e8c61789852ad1296ae.zip | |
updated Makefile.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index e97e201fec4..e8bf5286133 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -29,16 +29,20 @@ TARGETS = $(LIBNAME) $(DLLNAME) $(SVCLIBNAME) $(SVCDLLNAME) OBJS = IceStorm.obj \ -SOBJS = TraceLevels.obj \ + +SERVICE_OBJS = IceStorm.obj \ + TraceLevels.obj \ Flusher.obj \ Subscriber.obj \ OnewaySubscriber.obj \ OnewayBatchSubscriber.obj \ LinkSubscriber.obj \ SubscriberFactory.obj \ + KeepAliveThread.obj \ TopicI.obj \ TopicManagerI.obj \ - PersistentTopicMap.obj \ + PersistentTopicMap.obj \ + PersistentUpstreamMap.obj \ LinkRecord.obj \ IceStormInternal.obj \ Service.obj \ @@ -103,10 +107,15 @@ $(ADMIN): $(AOBJS) PersistentTopicMap.h PersistentTopicMap.cpp: ../IceStorm/LinkRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) del /q PersistentTopicMap.h PersistentTopicMap.cpp - $(SLICE2FREEZE) --ice --include-dir IceStorm -I.. -I$(slicedir) --dict \ - IceStorm::PersistentTopicMap,string,IceStorm::LinkRecordDict PersistentTopicMap \ + $(SLICE2FREEZE) --dict IceStorm::PersistentTopicMap,string,IceStorm::LinkRecordDict PersistentTopicMap \ ..\IceStorm\LinkRecord.ice + +PersistentUpstreamMap.h PersistentUpstreamMap.cpp: ../IceStorm/LinkRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) + del /q PersistentUpstreamMap.h PersistentUpstreamMap.cpp + $(SLICE2FREEZE) --dict IceStorm::PersistentUpstreamMap,string,IceStorm::TopicUpstreamLinkPrxSeq \ + PersistentUpstreamMap ../IceStorm/LinkRecord.ice + IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice $(SLICE2CPP) --dll-export ICE_STORM_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice move IceStorm.h $(HDIR) |