summaryrefslogtreecommitdiff
path: root/cpp/demo/Ice/nested/Makefile.mak
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/Ice/nested/Makefile.mak')
-rw-r--r--cpp/demo/Ice/nested/Makefile.mak26
1 files changed, 13 insertions, 13 deletions
diff --git a/cpp/demo/Ice/nested/Makefile.mak b/cpp/demo/Ice/nested/Makefile.mak
index 2f86286ac4b..97efe4fb8d9 100644
--- a/cpp/demo/Ice/nested/Makefile.mak
+++ b/cpp/demo/Ice/nested/Makefile.mak
@@ -14,18 +14,16 @@ SERVER = server.exe
TARGETS = $(CLIENT) $(SERVER)
-SLICE_OBJS = Nested.obj
-
-COBJS = $(SLICE_OBJS) \
- Client.obj \
+OBJS = Nested.obj \
NestedI.obj
-SOBJS = $(SLICE_OBJS) \
- Server.obj \
- NestedI.obj
+COBJS = Client.obj
+
+SOBJS = Server.obj
-OBJS = $(COBJS) \
- $(SOBJS)
+SRCS = $(OBJS:.obj=.cpp) \
+ $(COBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp)
!include $(top_srcdir)/config/Make.rules.mak
@@ -36,15 +34,17 @@ CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
!endif
-$(CLIENT): $(COBJS)
- $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT): $(OBJS) $(COBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-$(SERVER): $(SOBJS)
- $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER): $(OBJS) $(SOBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
clean::
del /q Nested.cpp Nested.h
+
+!include .depend.mak