diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-01-11 17:49:23 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-01-11 17:49:23 +0000 |
| commit | 368fcff16b12430bef18565dcfc78def7f070497 (patch) | |
| tree | 2b5a864ae637a79616a7e28e3aef4ee810b1adde /cpp/src | |
| parent | restructuring a bit (diff) | |
| download | ice-368fcff16b12430bef18565dcfc78def7f070497.tar.bz2 ice-368fcff16b12430bef18565dcfc78def7f070497.tar.xz ice-368fcff16b12430bef18565dcfc78def7f070497.zip | |
Replace .ice.h by .ice.cpp; fixed Oracle .mak files
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 9 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 67ded2e8335..47bcbec3f33 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -101,14 +101,17 @@ REGISTRY_SVR_OBJS = \ $(COMMON_OBJS) \ $(REGISTRY_OBJS) \ IceGridRegistry.obj - -SRCS = $(LIB_OBJS:.obj=.cpp) \ - $(ADMIN_OBJS:.obj=.cpp) \ + +!ifdef BUILD_UTILS +SRCS = $(ADMIN_OBJS:.obj=.cpp) \ $(COMMON_OBJS:.obj=.cpp) \ $(NODE_OBJS:.obj=.cpp) \ $(REGISTRY_OBJS:.obj=.cpp) \ IceGridNode.cpp \ IceGridRegistry.cpp +!else +SRCS = $(LIB_OBJS:.obj=.cpp) +!endif HDIR = $(includedir)\IceGrid SDIR = $(slicedir)\IceGrid diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 2f7bb6d7d31..ad6bc1c17e9 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -30,7 +30,9 @@ TARGETS = $(LIBNAME) $(DLLNAME) $(SVCLIBNAME) $(SVCDLLNAME) OBJS = IceStorm.obj \ -SERVICE_OBJS = IceStorm.obj \ +SERVICE_OBJS = IceStormInternal.obj \ + LinkRecord.obj \ + IceStorm.obj \ Instance.obj \ TraceLevels.obj \ BatchFlusher.obj \ @@ -39,8 +41,6 @@ SERVICE_OBJS = IceStorm.obj \ TopicI.obj \ TopicManagerI.obj \ PersistentTopicMap.obj \ - LinkRecord.obj \ - IceStormInternal.obj \ Event.obj \ Service.obj |