-$(YAZ_RES): $(YAZ_RC)
- $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC)
-
-###########################################################
-############### Linking
-###########################################################
-
-$(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
- @echo Linking $(YAZPP_DLL)
- $(LINK) @<<
- $(LNKOPT)
- $(LINK_LIBS)
- $(DLL_LINK_OPTIONS)
- $(YAZPP_DLL_OBJS)
- /out:"$(YAZPP_DLL)"
- /implib:"$(YAZPP_IMPLIB)"
- /map:"$(LIBDIR)\yazpp.map"
-<<
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+
+LINK_DLL = $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS)
+LINK_PROGRAM = $(LINK) $(LNKOPT) $(CLIENT_LINK_OPTIONS) $(LINK_LIBS) $(YAZPP_IMPLIB)
+
+
+$(DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(DLL_OBJS)
+ $(LINK_DLL) $(DLL_OBJS) /out:$@ /implib:"$(YAZPP_IMPLIB)"
+ $(MT) -manifest $@.manifest -outputresource:$@;2