INTEGRATION: CWS tune03 (1.24.62); FILE MERGED

2004/07/21 12:44:37 hjs 1.24.62.3: #i29979# fix different modes *.def creation
2004/07/20 17:54:32 hjs 1.24.62.2: #29979# don't leave *.def if aborted; still allow filtering
2004/07/20 10:24:38 hjs 1.24.62.1: #29979# SHLnUSE_EXPORTS must be ordinal, name or empty now

1 files changed, 500 insertions, 390 deletions

diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 880b23097af5..9a50ca2eb1ae 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -26,6 +26,8 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
@@ -46,15 +48,15 @@ EXPORT1_PROTECT=$(TMP)$/$(DEF1UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP1HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF1TARGETN) : \
         $(DEF1DEPN) \
         $(DEF1EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF1TARGETN) .PHONY : \
         $(DEF1DEPN) \
         $(DEF1EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
@@ -68,30 +70,37 @@ $(DEF1TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL1TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL1TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL1DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL1DESCRIPTION)"==""
 .IF "$(DEFLIB1NAME)"!=""
-    @+$(EXPORT1_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL1USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT1_PROTECT) $(RM) $(MISC)$/$(SHL1TARGET).exp
+    @+$(EXPORT1_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib
 .IF "$(DEF1CEXP)"!=""
-    @+$(EXPORT1_PROTECT) $(LDUMP2) -A $(DEF1CEXP) -E 20 -F $(MISC)$/$(SHL1TARGET).flt $(SHL1TARGET).exp			   >>$@
+    @+$(EXPORT1_PROTECT) $(LDUMP2) -A $(DEF1CEXP) -E 20 -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp			   >>$@.tmpfile
 .ELSE
-    @+$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL1TARGET).flt $(SHL1TARGET).exp			   >>$@
+    @+$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp			   >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT1_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL1TARGET).flt $(SHL1TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT1_PROTECT) $(RM) $(SHL1TARGET).exp
+    +$(EXPORT1_PROTECT) $(RM) $(MISC)$/$(SHL1TARGET).exp
+.ELSE			# "$(SHL1USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB1NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL1TARGET).direct
+.IF "$(DEF1CEXP)"!=""
+    @+$(EXPORT1_PROTECT) $(LDUMP2) -D -A $(DEF1CEXP) -E 20 -F $(DEF1FILTER) $(MISC)$/$(SHL1TARGET).direct >>$@.tmpfile
+.ELSE
+    @+$(EXPORT1_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF1FILTER) $(MISC)$/$(SHL1TARGET).direct >>$@.tmpfile
+.ENDIF
+.ENDIF			# "$(SHL1USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -106,68 +115,70 @@ $(DEF1TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB1NAME)"!=""
 .IF "$(DEF1EXPORT1)"!=""
-    @echo $(DEF1EXPORT1)										>>$@
+    @echo $(DEF1EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT2)"!=""
-    @echo $(DEF1EXPORT2)										>>$@
+    @echo $(DEF1EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT3)"!=""
-    @echo $(DEF1EXPORT3)										>>$@
+    @echo $(DEF1EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT4)"!=""
-    @echo $(DEF1EXPORT4)										>>$@
+    @echo $(DEF1EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT5)"!=""
-    @echo $(DEF1EXPORT5)										>>$@
+    @echo $(DEF1EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT6)"!=""
-    @echo $(DEF1EXPORT6)										>>$@
+    @echo $(DEF1EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT7)"!=""
-    @echo $(DEF1EXPORT7)										>>$@
+    @echo $(DEF1EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT8)"!=""
-    @echo $(DEF1EXPORT8)										>>$@
+    @echo $(DEF1EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT9)"!=""
-    @echo $(DEF1EXPORT9)										>>$@
+    @echo $(DEF1EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT10)"!=""
-    @echo $(DEF1EXPORT10)										>>$@
+    @echo $(DEF1EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT11)"!=""
-    @echo $(DEF1EXPORT11)										>>$@
+    @echo $(DEF1EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT12)"!=""
-    @echo $(DEF1EXPORT12)										>>$@
+    @echo $(DEF1EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT13)"!=""
-    @echo $(DEF1EXPORT13)										>>$@
+    @echo $(DEF1EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT14)"!=""
-    @echo $(DEF1EXPORT14)										>>$@
+    @echo $(DEF1EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT15)"!=""
-    @echo $(DEF1EXPORT15)										>>$@
+    @echo $(DEF1EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT16)"!=""
-    @echo $(DEF1EXPORT16)										>>$@
+    @echo $(DEF1EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT17)"!=""
-    @echo $(DEF1EXPORT17)										>>$@
+    @echo $(DEF1EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT18)"!=""
-    @echo $(DEF1EXPORT18)										>>$@
+    @echo $(DEF1EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT19)"!=""
-    @echo $(DEF1EXPORT19)										>>$@
+    @echo $(DEF1EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT20)"!=""
-    @echo $(DEF1EXPORT20)										>>$@
+    @echo $(DEF1EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORTFILE)"!=""
-    +$(TYPE) $(DEF1EXPORTFILE) >> $@
+    +$(TYPE) $(DEF1EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP1HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -212,6 +223,8 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
@@ -232,15 +245,15 @@ EXPORT2_PROTECT=$(TMP)$/$(DEF2UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP2HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF2TARGETN) : \
         $(DEF2DEPN) \
         $(DEF2EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF2TARGETN) .PHONY : \
         $(DEF2DEPN) \
         $(DEF2EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
@@ -254,30 +267,37 @@ $(DEF2TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL2TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL2TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL2DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL2DESCRIPTION)"==""
 .IF "$(DEFLIB2NAME)"!=""
-    @+$(EXPORT2_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL2USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT2_PROTECT) $(RM) $(MISC)$/$(SHL2TARGET).exp
+    @+$(EXPORT2_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib
 .IF "$(DEF2CEXP)"!=""
-    @+$(EXPORT2_PROTECT) $(LDUMP2) -A $(DEF2CEXP) -E 20 -F $(MISC)$/$(SHL2TARGET).flt $(SHL2TARGET).exp			   >>$@
+    @+$(EXPORT2_PROTECT) $(LDUMP2) -A $(DEF2CEXP) -E 20 -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp			   >>$@.tmpfile
 .ELSE
-    @+$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL2TARGET).flt $(SHL2TARGET).exp			   >>$@
+    @+$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp			   >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT2_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL2TARGET).flt $(SHL2TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT2_PROTECT) $(RM) $(SHL2TARGET).exp
+    +$(EXPORT2_PROTECT) $(RM) $(MISC)$/$(SHL2TARGET).exp
+.ELSE			# "$(SHL2USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB2NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL2TARGET).direct
+.IF "$(DEF2CEXP)"!=""
+    @+$(EXPORT2_PROTECT) $(LDUMP2) -D -A $(DEF2CEXP) -E 20 -F $(DEF2FILTER) $(MISC)$/$(SHL2TARGET).direct >>$@.tmpfile
+.ELSE
+    @+$(EXPORT2_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF2FILTER) $(MISC)$/$(SHL2TARGET).direct >>$@.tmpfile
+.ENDIF
+.ENDIF			# "$(SHL2USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -292,68 +312,70 @@ $(DEF2TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB2NAME)"!=""
 .IF "$(DEF2EXPORT1)"!=""
-    @echo $(DEF2EXPORT1)										>>$@
+    @echo $(DEF2EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT2)"!=""
-    @echo $(DEF2EXPORT2)										>>$@
+    @echo $(DEF2EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT3)"!=""
-    @echo $(DEF2EXPORT3)										>>$@
+    @echo $(DEF2EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT4)"!=""
-    @echo $(DEF2EXPORT4)										>>$@
+    @echo $(DEF2EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT5)"!=""
-    @echo $(DEF2EXPORT5)										>>$@
+    @echo $(DEF2EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT6)"!=""
-    @echo $(DEF2EXPORT6)										>>$@
+    @echo $(DEF2EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT7)"!=""
-    @echo $(DEF2EXPORT7)										>>$@
+    @echo $(DEF2EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT8)"!=""
-    @echo $(DEF2EXPORT8)										>>$@
+    @echo $(DEF2EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT9)"!=""
-    @echo $(DEF2EXPORT9)										>>$@
+    @echo $(DEF2EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT10)"!=""
-    @echo $(DEF2EXPORT10)										>>$@
+    @echo $(DEF2EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT11)"!=""
-    @echo $(DEF2EXPORT11)										>>$@
+    @echo $(DEF2EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT12)"!=""
-    @echo $(DEF2EXPORT12)										>>$@
+    @echo $(DEF2EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT13)"!=""
-    @echo $(DEF2EXPORT13)										>>$@
+    @echo $(DEF2EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT14)"!=""
-    @echo $(DEF2EXPORT14)										>>$@
+    @echo $(DEF2EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT15)"!=""
-    @echo $(DEF2EXPORT15)										>>$@
+    @echo $(DEF2EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT16)"!=""
-    @echo $(DEF2EXPORT16)										>>$@
+    @echo $(DEF2EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT17)"!=""
-    @echo $(DEF2EXPORT17)										>>$@
+    @echo $(DEF2EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT18)"!=""
-    @echo $(DEF2EXPORT18)										>>$@
+    @echo $(DEF2EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT19)"!=""
-    @echo $(DEF2EXPORT19)										>>$@
+    @echo $(DEF2EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT20)"!=""
-    @echo $(DEF2EXPORT20)										>>$@
+    @echo $(DEF2EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORTFILE)"!=""
-    +$(TYPE) $(DEF2EXPORTFILE) >> $@
+    +$(TYPE) $(DEF2EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP2HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -398,6 +420,8 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
@@ -418,15 +442,15 @@ EXPORT3_PROTECT=$(TMP)$/$(DEF3UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP3HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF3TARGETN) : \
         $(DEF3DEPN) \
         $(DEF3EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF3TARGETN) .PHONY : \
         $(DEF3DEPN) \
         $(DEF3EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
@@ -440,30 +464,37 @@ $(DEF3TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL3TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL3TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL3DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL3DESCRIPTION)"==""
 .IF "$(DEFLIB3NAME)"!=""
-    @+$(EXPORT3_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL3USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT3_PROTECT) $(RM) $(MISC)$/$(SHL3TARGET).exp
+    @+$(EXPORT3_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib
+.IF "$(DEF3CEXP)"!=""
+    @+$(EXPORT3_PROTECT) $(LDUMP2) -A $(DEF3CEXP) -E 20 -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp			   >>$@.tmpfile
+.ELSE
+    @+$(EXPORT3_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp			   >>$@.tmpfile
+.ENDIF
+    +$(EXPORT3_PROTECT) $(RM) $(MISC)$/$(SHL3TARGET).exp
+.ELSE			# "$(SHL3USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT3_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB3NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL3TARGET).direct
 .IF "$(DEF3CEXP)"!=""
-    @+$(EXPORT3_PROTECT) $(LDUMP2) -A $(DEF3CEXP) -E 20 -F $(MISC)$/$(SHL3TARGET).flt $(SHL3TARGET).exp			   >>$@
+    @+$(EXPORT3_PROTECT) $(LDUMP2) -D -A $(DEF3CEXP) -E 20 -F $(DEF3FILTER) $(MISC)$/$(SHL3TARGET).direct >>$@.tmpfile
 .ELSE
-    @+$(EXPORT3_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL3TARGET).flt $(SHL3TARGET).exp			   >>$@
+    @+$(EXPORT3_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF3FILTER) $(MISC)$/$(SHL3TARGET).direct >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT3_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL3TARGET).flt $(SHL3TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT3_PROTECT) $(RM) $(SHL3TARGET).exp
+.ENDIF			# "$(SHL3USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -478,68 +509,70 @@ $(DEF3TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB3NAME)"!=""
 .IF "$(DEF3EXPORT1)"!=""
-    @echo $(DEF3EXPORT1)										>>$@
+    @echo $(DEF3EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT2)"!=""
-    @echo $(DEF3EXPORT2)										>>$@
+    @echo $(DEF3EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT3)"!=""
-    @echo $(DEF3EXPORT3)										>>$@
+    @echo $(DEF3EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT4)"!=""
-    @echo $(DEF3EXPORT4)										>>$@
+    @echo $(DEF3EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT5)"!=""
-    @echo $(DEF3EXPORT5)										>>$@
+    @echo $(DEF3EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT6)"!=""
-    @echo $(DEF3EXPORT6)										>>$@
+    @echo $(DEF3EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT7)"!=""
-    @echo $(DEF3EXPORT7)										>>$@
+    @echo $(DEF3EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT8)"!=""
-    @echo $(DEF3EXPORT8)										>>$@
+    @echo $(DEF3EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT9)"!=""
-    @echo $(DEF3EXPORT9)										>>$@
+    @echo $(DEF3EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT10)"!=""
-    @echo $(DEF3EXPORT10)										>>$@
+    @echo $(DEF3EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT11)"!=""
-    @echo $(DEF3EXPORT11)										>>$@
+    @echo $(DEF3EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT12)"!=""
-    @echo $(DEF3EXPORT12)										>>$@
+    @echo $(DEF3EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT13)"!=""
-    @echo $(DEF3EXPORT13)										>>$@
+    @echo $(DEF3EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT14)"!=""
-    @echo $(DEF3EXPORT14)										>>$@
+    @echo $(DEF3EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT15)"!=""
-    @echo $(DEF3EXPORT15)										>>$@
+    @echo $(DEF3EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT16)"!=""
-    @echo $(DEF3EXPORT16)										>>$@
+    @echo $(DEF3EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT17)"!=""
-    @echo $(DEF3EXPORT17)										>>$@
+    @echo $(DEF3EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT18)"!=""
-    @echo $(DEF3EXPORT18)										>>$@
+    @echo $(DEF3EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT19)"!=""
-    @echo $(DEF3EXPORT19)										>>$@
+    @echo $(DEF3EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT20)"!=""
-    @echo $(DEF3EXPORT20)										>>$@
+    @echo $(DEF3EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORTFILE)"!=""
-    +$(TYPE) $(DEF3EXPORTFILE) >> $@
+    +$(TYPE) $(DEF3EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP3HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -584,6 +617,8 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
@@ -604,15 +639,15 @@ EXPORT4_PROTECT=$(TMP)$/$(DEF4UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP4HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF4TARGETN) : \
         $(DEF4DEPN) \
         $(DEF4EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF4TARGETN) .PHONY : \
         $(DEF4DEPN) \
         $(DEF4EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
@@ -626,30 +661,37 @@ $(DEF4TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL4TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL4TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL4DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL4DESCRIPTION)"==""
 .IF "$(DEFLIB4NAME)"!=""
-    @+$(EXPORT4_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL4USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT4_PROTECT) $(RM) $(MISC)$/$(SHL4TARGET).exp
+    @+$(EXPORT4_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib
+.IF "$(DEF4CEXP)"!=""
+    @+$(EXPORT4_PROTECT) $(LDUMP2) -A $(DEF4CEXP) -E 20 -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp			   >>$@.tmpfile
+.ELSE
+    @+$(EXPORT4_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp			   >>$@.tmpfile
+.ENDIF
+    +$(EXPORT4_PROTECT) $(RM) $(MISC)$/$(SHL4TARGET).exp
+.ELSE			# "$(SHL4USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT4_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB4NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL4TARGET).direct
 .IF "$(DEF4CEXP)"!=""
-    @+$(EXPORT4_PROTECT) $(LDUMP2) -A $(DEF4CEXP) -E 20 -F $(MISC)$/$(SHL4TARGET).flt $(SHL4TARGET).exp			   >>$@
+    @+$(EXPORT4_PROTECT) $(LDUMP2) -D -A $(DEF4CEXP) -E 20 -F $(DEF4FILTER) $(MISC)$/$(SHL4TARGET).direct >>$@.tmpfile
 .ELSE
-    @+$(EXPORT4_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL4TARGET).flt $(SHL4TARGET).exp			   >>$@
+    @+$(EXPORT4_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF4FILTER) $(MISC)$/$(SHL4TARGET).direct >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT4_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL4TARGET).flt $(SHL4TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT4_PROTECT) $(RM) $(SHL4TARGET).exp
+.ENDIF			# "$(SHL4USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -664,68 +706,70 @@ $(DEF4TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB4NAME)"!=""
 .IF "$(DEF4EXPORT1)"!=""
-    @echo $(DEF4EXPORT1)										>>$@
+    @echo $(DEF4EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT2)"!=""
-    @echo $(DEF4EXPORT2)										>>$@
+    @echo $(DEF4EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT3)"!=""
-    @echo $(DEF4EXPORT3)										>>$@
+    @echo $(DEF4EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT4)"!=""
-    @echo $(DEF4EXPORT4)										>>$@
+    @echo $(DEF4EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT5)"!=""
-    @echo $(DEF4EXPORT5)										>>$@
+    @echo $(DEF4EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT6)"!=""
-    @echo $(DEF4EXPORT6)										>>$@
+    @echo $(DEF4EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT7)"!=""
-    @echo $(DEF4EXPORT7)										>>$@
+    @echo $(DEF4EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT8)"!=""
-    @echo $(DEF4EXPORT8)										>>$@
+    @echo $(DEF4EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT9)"!=""
-    @echo $(DEF4EXPORT9)										>>$@
+    @echo $(DEF4EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT10)"!=""
-    @echo $(DEF4EXPORT10)										>>$@
+    @echo $(DEF4EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT11)"!=""
-    @echo $(DEF4EXPORT11)										>>$@
+    @echo $(DEF4EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT12)"!=""
-    @echo $(DEF4EXPORT12)										>>$@
+    @echo $(DEF4EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT13)"!=""
-    @echo $(DEF4EXPORT13)										>>$@
+    @echo $(DEF4EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT14)"!=""
-    @echo $(DEF4EXPORT14)										>>$@
+    @echo $(DEF4EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT15)"!=""
-    @echo $(DEF4EXPORT15)										>>$@
+    @echo $(DEF4EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT16)"!=""
-    @echo $(DEF4EXPORT16)										>>$@
+    @echo $(DEF4EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT17)"!=""
-    @echo $(DEF4EXPORT17)										>>$@
+    @echo $(DEF4EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT18)"!=""
-    @echo $(DEF4EXPORT18)										>>$@
+    @echo $(DEF4EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT19)"!=""
-    @echo $(DEF4EXPORT19)										>>$@
+    @echo $(DEF4EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT20)"!=""
-    @echo $(DEF4EXPORT20)										>>$@
+    @echo $(DEF4EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORTFILE)"!=""
-    +$(TYPE) $(DEF4EXPORTFILE) >> $@
+    +$(TYPE) $(DEF4EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP4HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -770,6 +814,8 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
@@ -790,15 +836,15 @@ EXPORT5_PROTECT=$(TMP)$/$(DEF5UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP5HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF5TARGETN) : \
         $(DEF5DEPN) \
         $(DEF5EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF5TARGETN) .PHONY : \
         $(DEF5DEPN) \
         $(DEF5EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
@@ -812,30 +858,37 @@ $(DEF5TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL5TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL5TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL5DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL5DESCRIPTION)"==""
 .IF "$(DEFLIB5NAME)"!=""
-    @+$(EXPORT5_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL5USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT5_PROTECT) $(RM) $(MISC)$/$(SHL5TARGET).exp
+    @+$(EXPORT5_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib
+.IF "$(DEF5CEXP)"!=""
+    @+$(EXPORT5_PROTECT) $(LDUMP2) -A $(DEF5CEXP) -E 20 -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp			   >>$@.tmpfile
+.ELSE
+    @+$(EXPORT5_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp			   >>$@.tmpfile
+.ENDIF
+    +$(EXPORT5_PROTECT) $(RM) $(MISC)$/$(SHL5TARGET).exp
+.ELSE			# "$(SHL5USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT5_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB5NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL5TARGET).direct
 .IF "$(DEF5CEXP)"!=""
-    @+$(EXPORT5_PROTECT) $(LDUMP2) -A $(DEF5CEXP) -E 20 -F $(MISC)$/$(SHL5TARGET).flt $(SHL5TARGET).exp			   >>$@
+    @+$(EXPORT5_PROTECT) $(LDUMP2) -D -A $(DEF5CEXP) -E 20 -F $(DEF5FILTER) $(MISC)$/$(SHL5TARGET).direct >>$@.tmpfile
 .ELSE
-    @+$(EXPORT5_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL5TARGET).flt $(SHL5TARGET).exp			   >>$@
+    @+$(EXPORT5_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF5FILTER) $(MISC)$/$(SHL5TARGET).direct >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT5_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL5TARGET).flt $(SHL5TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT5_PROTECT) $(RM) $(SHL5TARGET).exp
+.ENDIF			# "$(SHL5USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -850,68 +903,70 @@ $(DEF5TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB5NAME)"!=""
 .IF "$(DEF5EXPORT1)"!=""
-    @echo $(DEF5EXPORT1)										>>$@
+    @echo $(DEF5EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT2)"!=""
-    @echo $(DEF5EXPORT2)										>>$@
+    @echo $(DEF5EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT3)"!=""
-    @echo $(DEF5EXPORT3)										>>$@
+    @echo $(DEF5EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT4)"!=""
-    @echo $(DEF5EXPORT4)										>>$@
+    @echo $(DEF5EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT5)"!=""
-    @echo $(DEF5EXPORT5)										>>$@
+    @echo $(DEF5EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT6)"!=""
-    @echo $(DEF5EXPORT6)										>>$@
+    @echo $(DEF5EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT7)"!=""
-    @echo $(DEF5EXPORT7)										>>$@
+    @echo $(DEF5EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT8)"!=""
-    @echo $(DEF5EXPORT8)										>>$@
+    @echo $(DEF5EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT9)"!=""
-    @echo $(DEF5EXPORT9)										>>$@
+    @echo $(DEF5EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT10)"!=""
-    @echo $(DEF5EXPORT10)										>>$@
+    @echo $(DEF5EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT11)"!=""
-    @echo $(DEF5EXPORT11)										>>$@
+    @echo $(DEF5EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT12)"!=""
-    @echo $(DEF5EXPORT12)										>>$@
+    @echo $(DEF5EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT13)"!=""
-    @echo $(DEF5EXPORT13)										>>$@
+    @echo $(DEF5EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT14)"!=""
-    @echo $(DEF5EXPORT14)										>>$@
+    @echo $(DEF5EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT15)"!=""
-    @echo $(DEF5EXPORT15)										>>$@
+    @echo $(DEF5EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT16)"!=""
-    @echo $(DEF5EXPORT16)										>>$@
+    @echo $(DEF5EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT17)"!=""
-    @echo $(DEF5EXPORT17)										>>$@
+    @echo $(DEF5EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT18)"!=""
-    @echo $(DEF5EXPORT18)										>>$@
+    @echo $(DEF5EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT19)"!=""
-    @echo $(DEF5EXPORT19)										>>$@
+    @echo $(DEF5EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT20)"!=""
-    @echo $(DEF5EXPORT20)										>>$@
+    @echo $(DEF5EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORTFILE)"!=""
-    +$(TYPE) $(DEF5EXPORTFILE) >> $@
+    +$(TYPE) $(DEF5EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP5HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -956,6 +1011,8 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
@@ -976,15 +1033,15 @@ EXPORT6_PROTECT=$(TMP)$/$(DEF6UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP6HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF6TARGETN) : \
         $(DEF6DEPN) \
         $(DEF6EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF6TARGETN) .PHONY : \
         $(DEF6DEPN) \
         $(DEF6EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
@@ -998,30 +1055,37 @@ $(DEF6TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL6TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL6TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL6DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL6DESCRIPTION)"==""
 .IF "$(DEFLIB6NAME)"!=""
-    @+$(EXPORT6_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL6USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT6_PROTECT) $(RM) $(MISC)$/$(SHL6TARGET).exp
+    @+$(EXPORT6_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib
 .IF "$(DEF6CEXP)"!=""
-    @+$(EXPORT6_PROTECT) $(LDUMP2) -A $(DEF6CEXP) -E 20 -F $(MISC)$/$(SHL6TARGET).flt $(SHL6TARGET).exp			   >>$@
+    @+$(EXPORT6_PROTECT) $(LDUMP2) -A $(DEF6CEXP) -E 20 -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp			   >>$@.tmpfile
 .ELSE
-    @+$(EXPORT6_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL6TARGET).flt $(SHL6TARGET).exp			   >>$@
+    @+$(EXPORT6_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp			   >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT6_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL6TARGET).flt $(SHL6TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT6_PROTECT) $(RM) $(SHL6TARGET).exp
+    +$(EXPORT6_PROTECT) $(RM) $(MISC)$/$(SHL6TARGET).exp
+.ELSE			# "$(SHL6USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT6_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB6NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL6TARGET).direct
+.IF "$(DEF6CEXP)"!=""
+    @+$(EXPORT6_PROTECT) $(LDUMP2) -D -A $(DEF6CEXP) -E 20 -F $(DEF6FILTER) $(MISC)$/$(SHL6TARGET).direct >>$@.tmpfile
+.ELSE
+    @+$(EXPORT6_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF6FILTER) $(MISC)$/$(SHL6TARGET).direct >>$@.tmpfile
+.ENDIF
+.ENDIF			# "$(SHL6USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -1036,68 +1100,70 @@ $(DEF6TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB6NAME)"!=""
 .IF "$(DEF6EXPORT1)"!=""
-    @echo $(DEF6EXPORT1)										>>$@
+    @echo $(DEF6EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT2)"!=""
-    @echo $(DEF6EXPORT2)										>>$@
+    @echo $(DEF6EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT3)"!=""
-    @echo $(DEF6EXPORT3)										>>$@
+    @echo $(DEF6EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT4)"!=""
-    @echo $(DEF6EXPORT4)										>>$@
+    @echo $(DEF6EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT5)"!=""
-    @echo $(DEF6EXPORT5)										>>$@
+    @echo $(DEF6EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT6)"!=""
-    @echo $(DEF6EXPORT6)										>>$@
+    @echo $(DEF6EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT7)"!=""
-    @echo $(DEF6EXPORT7)										>>$@
+    @echo $(DEF6EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT8)"!=""
-    @echo $(DEF6EXPORT8)										>>$@
+    @echo $(DEF6EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT9)"!=""
-    @echo $(DEF6EXPORT9)										>>$@
+    @echo $(DEF6EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT10)"!=""
-    @echo $(DEF6EXPORT10)										>>$@
+    @echo $(DEF6EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT11)"!=""
-    @echo $(DEF6EXPORT11)										>>$@
+    @echo $(DEF6EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT12)"!=""
-    @echo $(DEF6EXPORT12)										>>$@
+    @echo $(DEF6EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT13)"!=""
-    @echo $(DEF6EXPORT13)										>>$@
+    @echo $(DEF6EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT14)"!=""
-    @echo $(DEF6EXPORT14)										>>$@
+    @echo $(DEF6EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT15)"!=""
-    @echo $(DEF6EXPORT15)										>>$@
+    @echo $(DEF6EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT16)"!=""
-    @echo $(DEF6EXPORT16)										>>$@
+    @echo $(DEF6EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT17)"!=""
-    @echo $(DEF6EXPORT17)										>>$@
+    @echo $(DEF6EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT18)"!=""
-    @echo $(DEF6EXPORT18)										>>$@
+    @echo $(DEF6EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT19)"!=""
-    @echo $(DEF6EXPORT19)										>>$@
+    @echo $(DEF6EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT20)"!=""
-    @echo $(DEF6EXPORT20)										>>$@
+    @echo $(DEF6EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORTFILE)"!=""
-    +$(TYPE) $(DEF6EXPORTFILE) >> $@
+    +$(TYPE) $(DEF6EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP6HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -1142,6 +1208,8 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
@@ -1162,15 +1230,15 @@ EXPORT7_PROTECT=$(TMP)$/$(DEF7UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP7HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF7TARGETN) : \
         $(DEF7DEPN) \
         $(DEF7EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF7TARGETN) .PHONY : \
         $(DEF7DEPN) \
         $(DEF7EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
@@ -1184,30 +1252,37 @@ $(DEF7TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL7TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL7TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL7DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL7DESCRIPTION)"==""
 .IF "$(DEFLIB7NAME)"!=""
-    @+$(EXPORT7_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL7USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT7_PROTECT) $(RM) $(MISC)$/$(SHL7TARGET).exp
+    @+$(EXPORT7_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib
 .IF "$(DEF7CEXP)"!=""
-    @+$(EXPORT7_PROTECT) $(LDUMP2) -A $(DEF7CEXP) -E 20 -F $(MISC)$/$(SHL7TARGET).flt $(SHL7TARGET).exp			   >>$@
+    @+$(EXPORT7_PROTECT) $(LDUMP2) -A $(DEF7CEXP) -E 20 -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp			   >>$@.tmpfile
 .ELSE
-    @+$(EXPORT7_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL7TARGET).flt $(SHL7TARGET).exp			   >>$@
+    @+$(EXPORT7_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp			   >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT7_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL7TARGET).flt $(SHL7TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT7_PROTECT) $(RM) $(SHL7TARGET).exp
+    +$(EXPORT7_PROTECT) $(RM) $(MISC)$/$(SHL7TARGET).exp
+.ELSE			# "$(SHL7USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT7_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB7NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL7TARGET).direct
+.IF "$(DEF7CEXP)"!=""
+    @+$(EXPORT7_PROTECT) $(LDUMP2) -D -A $(DEF7CEXP) -E 20 -F $(DEF7FILTER) $(MISC)$/$(SHL7TARGET).direct >>$@.tmpfile
+.ELSE
+    @+$(EXPORT7_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF7FILTER) $(MISC)$/$(SHL7TARGET).direct >>$@.tmpfile
+.ENDIF
+.ENDIF			# "$(SHL7USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -1222,68 +1297,70 @@ $(DEF7TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB7NAME)"!=""
 .IF "$(DEF7EXPORT1)"!=""
-    @echo $(DEF7EXPORT1)										>>$@
+    @echo $(DEF7EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT2)"!=""
-    @echo $(DEF7EXPORT2)										>>$@
+    @echo $(DEF7EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT3)"!=""
-    @echo $(DEF7EXPORT3)										>>$@
+    @echo $(DEF7EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT4)"!=""
-    @echo $(DEF7EXPORT4)										>>$@
+    @echo $(DEF7EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT5)"!=""
-    @echo $(DEF7EXPORT5)										>>$@
+    @echo $(DEF7EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT6)"!=""
-    @echo $(DEF7EXPORT6)										>>$@
+    @echo $(DEF7EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT7)"!=""
-    @echo $(DEF7EXPORT7)										>>$@
+    @echo $(DEF7EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT8)"!=""
-    @echo $(DEF7EXPORT8)										>>$@
+    @echo $(DEF7EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT9)"!=""
-    @echo $(DEF7EXPORT9)										>>$@
+    @echo $(DEF7EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT10)"!=""
-    @echo $(DEF7EXPORT10)										>>$@
+    @echo $(DEF7EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT11)"!=""
-    @echo $(DEF7EXPORT11)										>>$@
+    @echo $(DEF7EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT12)"!=""
-    @echo $(DEF7EXPORT12)										>>$@
+    @echo $(DEF7EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT13)"!=""
-    @echo $(DEF7EXPORT13)										>>$@
+    @echo $(DEF7EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT14)"!=""
-    @echo $(DEF7EXPORT14)										>>$@
+    @echo $(DEF7EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT15)"!=""
-    @echo $(DEF7EXPORT15)										>>$@
+    @echo $(DEF7EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT16)"!=""
-    @echo $(DEF7EXPORT16)										>>$@
+    @echo $(DEF7EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT17)"!=""
-    @echo $(DEF7EXPORT17)										>>$@
+    @echo $(DEF7EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT18)"!=""
-    @echo $(DEF7EXPORT18)										>>$@
+    @echo $(DEF7EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT19)"!=""
-    @echo $(DEF7EXPORT19)										>>$@
+    @echo $(DEF7EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT20)"!=""
-    @echo $(DEF7EXPORT20)										>>$@
+    @echo $(DEF7EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORTFILE)"!=""
-    +$(TYPE) $(DEF7EXPORTFILE) >> $@
+    +$(TYPE) $(DEF7EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP7HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -1328,6 +1405,8 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
@@ -1348,15 +1427,15 @@ EXPORT8_PROTECT=$(TMP)$/$(DEF8UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP8HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF8TARGETN) : \
         $(DEF8DEPN) \
         $(DEF8EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF8TARGETN) .PHONY : \
         $(DEF8DEPN) \
         $(DEF8EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
@@ -1370,30 +1449,37 @@ $(DEF8TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL8TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL8TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL8DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL8DESCRIPTION)"==""
 .IF "$(DEFLIB8NAME)"!=""
-    @+$(EXPORT8_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL8USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT8_PROTECT) $(RM) $(MISC)$/$(SHL8TARGET).exp
+    @+$(EXPORT8_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib
+.IF "$(DEF8CEXP)"!=""
+    @+$(EXPORT8_PROTECT) $(LDUMP2) -A $(DEF8CEXP) -E 20 -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp			   >>$@.tmpfile
+.ELSE
+    @+$(EXPORT8_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp			   >>$@.tmpfile
+.ENDIF
+    +$(EXPORT8_PROTECT) $(RM) $(MISC)$/$(SHL8TARGET).exp
+.ELSE			# "$(SHL8USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT8_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB8NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL8TARGET).direct
 .IF "$(DEF8CEXP)"!=""
-    @+$(EXPORT8_PROTECT) $(LDUMP2) -A $(DEF8CEXP) -E 20 -F $(MISC)$/$(SHL8TARGET).flt $(SHL8TARGET).exp			   >>$@
+    @+$(EXPORT8_PROTECT) $(LDUMP2) -D -A $(DEF8CEXP) -E 20 -F $(DEF8FILTER) $(MISC)$/$(SHL8TARGET).direct >>$@.tmpfile
 .ELSE
-    @+$(EXPORT8_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL8TARGET).flt $(SHL8TARGET).exp			   >>$@
+    @+$(EXPORT8_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF8FILTER) $(MISC)$/$(SHL8TARGET).direct >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT8_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL8TARGET).flt $(SHL8TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT8_PROTECT) $(RM) $(SHL8TARGET).exp
+.ENDIF			# "$(SHL8USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -1408,68 +1494,70 @@ $(DEF8TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB8NAME)"!=""
 .IF "$(DEF8EXPORT1)"!=""
-    @echo $(DEF8EXPORT1)										>>$@
+    @echo $(DEF8EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT2)"!=""
-    @echo $(DEF8EXPORT2)										>>$@
+    @echo $(DEF8EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT3)"!=""
-    @echo $(DEF8EXPORT3)										>>$@
+    @echo $(DEF8EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT4)"!=""
-    @echo $(DEF8EXPORT4)										>>$@
+    @echo $(DEF8EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT5)"!=""
-    @echo $(DEF8EXPORT5)										>>$@
+    @echo $(DEF8EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT6)"!=""
-    @echo $(DEF8EXPORT6)										>>$@
+    @echo $(DEF8EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT7)"!=""
-    @echo $(DEF8EXPORT7)										>>$@
+    @echo $(DEF8EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT8)"!=""
-    @echo $(DEF8EXPORT8)										>>$@
+    @echo $(DEF8EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT9)"!=""
-    @echo $(DEF8EXPORT9)										>>$@
+    @echo $(DEF8EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT10)"!=""
-    @echo $(DEF8EXPORT10)										>>$@
+    @echo $(DEF8EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT11)"!=""
-    @echo $(DEF8EXPORT11)										>>$@
+    @echo $(DEF8EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT12)"!=""
-    @echo $(DEF8EXPORT12)										>>$@
+    @echo $(DEF8EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT13)"!=""
-    @echo $(DEF8EXPORT13)										>>$@
+    @echo $(DEF8EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT14)"!=""
-    @echo $(DEF8EXPORT14)										>>$@
+    @echo $(DEF8EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT15)"!=""
-    @echo $(DEF8EXPORT15)										>>$@
+    @echo $(DEF8EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT16)"!=""
-    @echo $(DEF8EXPORT16)										>>$@
+    @echo $(DEF8EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT17)"!=""
-    @echo $(DEF8EXPORT17)										>>$@
+    @echo $(DEF8EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT18)"!=""
-    @echo $(DEF8EXPORT18)										>>$@
+    @echo $(DEF8EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT19)"!=""
-    @echo $(DEF8EXPORT19)										>>$@
+    @echo $(DEF8EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT20)"!=""
-    @echo $(DEF8EXPORT20)										>>$@
+    @echo $(DEF8EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORTFILE)"!=""
-    +$(TYPE) $(DEF8EXPORTFILE) >> $@
+    +$(TYPE) $(DEF8EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP8HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -1514,6 +1602,8 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
@@ -1534,15 +1624,15 @@ EXPORT9_PROTECT=$(TMP)$/$(DEF9UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP9HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF9TARGETN) : \
         $(DEF9DEPN) \
         $(DEF9EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF9TARGETN) .PHONY : \
         $(DEF9DEPN) \
         $(DEF9EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
@@ -1556,30 +1646,37 @@ $(DEF9TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL9TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL9TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL9DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL9DESCRIPTION)"==""
 .IF "$(DEFLIB9NAME)"!=""
-    @+$(EXPORT9_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL9USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT9_PROTECT) $(RM) $(MISC)$/$(SHL9TARGET).exp
+    @+$(EXPORT9_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib
+.IF "$(DEF9CEXP)"!=""
+    @+$(EXPORT9_PROTECT) $(LDUMP2) -A $(DEF9CEXP) -E 20 -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp			   >>$@.tmpfile
+.ELSE
+    @+$(EXPORT9_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp			   >>$@.tmpfile
+.ENDIF
+    +$(EXPORT9_PROTECT) $(RM) $(MISC)$/$(SHL9TARGET).exp
+.ELSE			# "$(SHL9USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT9_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB9NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL9TARGET).direct
 .IF "$(DEF9CEXP)"!=""
-    @+$(EXPORT9_PROTECT) $(LDUMP2) -A $(DEF9CEXP) -E 20 -F $(MISC)$/$(SHL9TARGET).flt $(SHL9TARGET).exp			   >>$@
+    @+$(EXPORT9_PROTECT) $(LDUMP2) -D -A $(DEF9CEXP) -E 20 -F $(DEF9FILTER) $(MISC)$/$(SHL9TARGET).direct >>$@.tmpfile
 .ELSE
-    @+$(EXPORT9_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL9TARGET).flt $(SHL9TARGET).exp			   >>$@
+    @+$(EXPORT9_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF9FILTER) $(MISC)$/$(SHL9TARGET).direct >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT9_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL9TARGET).flt $(SHL9TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT9_PROTECT) $(RM) $(SHL9TARGET).exp
+.ENDIF			# "$(SHL9USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -1594,68 +1691,70 @@ $(DEF9TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB9NAME)"!=""
 .IF "$(DEF9EXPORT1)"!=""
-    @echo $(DEF9EXPORT1)										>>$@
+    @echo $(DEF9EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT2)"!=""
-    @echo $(DEF9EXPORT2)										>>$@
+    @echo $(DEF9EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT3)"!=""
-    @echo $(DEF9EXPORT3)										>>$@
+    @echo $(DEF9EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT4)"!=""
-    @echo $(DEF9EXPORT4)										>>$@
+    @echo $(DEF9EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT5)"!=""
-    @echo $(DEF9EXPORT5)										>>$@
+    @echo $(DEF9EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT6)"!=""
-    @echo $(DEF9EXPORT6)										>>$@
+    @echo $(DEF9EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT7)"!=""
-    @echo $(DEF9EXPORT7)										>>$@
+    @echo $(DEF9EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT8)"!=""
-    @echo $(DEF9EXPORT8)										>>$@
+    @echo $(DEF9EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT9)"!=""
-    @echo $(DEF9EXPORT9)										>>$@
+    @echo $(DEF9EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT10)"!=""
-    @echo $(DEF9EXPORT10)										>>$@
+    @echo $(DEF9EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT11)"!=""
-    @echo $(DEF9EXPORT11)										>>$@
+    @echo $(DEF9EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT12)"!=""
-    @echo $(DEF9EXPORT12)										>>$@
+    @echo $(DEF9EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT13)"!=""
-    @echo $(DEF9EXPORT13)										>>$@
+    @echo $(DEF9EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT14)"!=""
-    @echo $(DEF9EXPORT14)										>>$@
+    @echo $(DEF9EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT15)"!=""
-    @echo $(DEF9EXPORT15)										>>$@
+    @echo $(DEF9EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT16)"!=""
-    @echo $(DEF9EXPORT16)										>>$@
+    @echo $(DEF9EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT17)"!=""
-    @echo $(DEF9EXPORT17)										>>$@
+    @echo $(DEF9EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT18)"!=""
-    @echo $(DEF9EXPORT18)										>>$@
+    @echo $(DEF9EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT19)"!=""
-    @echo $(DEF9EXPORT19)										>>$@
+    @echo $(DEF9EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT20)"!=""
-    @echo $(DEF9EXPORT20)										>>$@
+    @echo $(DEF9EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORTFILE)"!=""
-    +$(TYPE) $(DEF9EXPORTFILE) >> $@
+    +$(TYPE) $(DEF9EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP9HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"
 
@@ -1700,6 +1799,8 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
+DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt
+
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
@@ -1720,15 +1821,15 @@ EXPORT10_PROTECT=$(TMP)$/$(DEF10UNIQE:b).bat &&
 .ENDIF			# "$(MWS_BUILD)"!=""
 
 .IF "$(APP10HEAP)"==""
-.IF "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.IF "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF10TARGETN) : \
         $(DEF10DEPN) \
         $(DEF10EXPORTFILE)
-.ELSE			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ELSE			# "$(UPDATER)"=="" || "$(link_always)"==""
 $(DEF10TARGETN) .PHONY : \
         $(DEF10DEPN) \
         $(DEF10EXPORTFILE)
-.ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
+.ENDIF			# "$(UPDATER)"=="" || "$(link_always)"==""
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
@@ -1742,30 +1843,37 @@ $(DEF10TARGETN) .PHONY : \
 .ENDIF			# "$(UPDATER)"!=""
 .ENDIF			# "$(MWS_BUILD)"!=""
 #	+-attrib -r defs$/$(OUTPATH)
+    @+-$(RM) $@.tmpfile
     @echo ------------------------------
     @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(SHL10TARGET) 								 >$@
-    @echo DESCRIPTION	'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@
-    @echo DATA		  READ WRITE SHARED  							>>$@
-    @echo HEAPSIZE	  0 											>>$@
-    @echo EXPORTS													>>$@
+    @echo LIBRARY	  $(SHL10TARGET) 								 >$@.tmpfile
+    @echo DESCRIPTION	'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
+    @echo DATA		  READ WRITE SHARED  							>>$@.tmpfile
+    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    @echo EXPORTS													>>$@.tmpfile
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@
+    @echo GetVersionInfo		>>$@.tmpfile
 .IF "$(NO_SHL10DESCRIPTION)"==""
-    @echo component_getDescriptionFunc	>>$@
+    @echo component_getDescriptionFunc	>>$@.tmpfile
 .ENDIF			# "$(NO_SHL10DESCRIPTION)"==""
 .IF "$(DEFLIB10NAME)"!=""
-    @+$(EXPORT10_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib
-.IF "$(USE_LDUMP2)"=!""
+.IF "$(SHL10USE_EXPORTS)"!="ordinal"
+    @-+$(EXPORT10_PROTECT) $(RM) $(MISC)$/$(SHL10TARGET).exp
+    @+$(EXPORT10_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib
+.IF "$(DEF10CEXP)"!=""
+    @+$(EXPORT10_PROTECT) $(LDUMP2) -A $(DEF10CEXP) -E 20 -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp			   >>$@.tmpfile
+.ELSE
+    @+$(EXPORT10_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp			   >>$@.tmpfile
+.ENDIF
+    +$(EXPORT10_PROTECT) $(RM) $(MISC)$/$(SHL10TARGET).exp
+.ELSE			# "$(SHL10USE_EXPORTS)"!="ordinal"
+    @+$(EXPORT10_PROTECT) $(DUMPBIN) -DIRECTIVES $(SLB)$/$(DEFLIB10NAME).lib | $(GREP) EXPORT: > $(MISC)$/$(SHL10TARGET).direct
 .IF "$(DEF10CEXP)"!=""
-    @+$(EXPORT10_PROTECT) $(LDUMP2) -A $(DEF10CEXP) -E 20 -F $(MISC)$/$(SHL10TARGET).flt $(SHL10TARGET).exp			   >>$@
+    @+$(EXPORT10_PROTECT) $(LDUMP2) -D -A $(DEF10CEXP) -E 20 -F $(DEF10FILTER) $(MISC)$/$(SHL10TARGET).direct >>$@.tmpfile
 .ELSE
-    @+$(EXPORT10_PROTECT) $(LDUMP2) -E 20 -F $(MISC)$/$(SHL10TARGET).flt $(SHL10TARGET).exp			   >>$@
+    @+$(EXPORT10_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF10FILTER) $(MISC)$/$(SHL10TARGET).direct >>$@.tmpfile
 .ENDIF
-.ELSE				# "$(USE_LDUMP2)"=!""
-    @+$(EXPORT10_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL10TARGET).flt $(SHL10TARGET).exp			   >>$@
-.ENDIF				# "$(USE_LDUMP2)"=!""
-    +$(EXPORT10_PROTECT) $(RM) $(SHL10TARGET).exp
+.ENDIF			# "$(SHL10USE_EXPORTS)"!="ordinal"
 # now *\defs\$(OUTPATH)	exists, commit it
 .IF "$(MWS_BUILD)"!=""
 .IF "$(UPDATER)"!=""
@@ -1780,68 +1888,70 @@ $(DEF10TARGETN) .PHONY : \
 .ENDIF			# "$(MWS_BUILD)"!=""
 .ENDIF				# "$(DEFLIB10NAME)"!=""
 .IF "$(DEF10EXPORT1)"!=""
-    @echo $(DEF10EXPORT1)										>>$@
+    @echo $(DEF10EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT2)"!=""
-    @echo $(DEF10EXPORT2)										>>$@
+    @echo $(DEF10EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT3)"!=""
-    @echo $(DEF10EXPORT3)										>>$@
+    @echo $(DEF10EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT4)"!=""
-    @echo $(DEF10EXPORT4)										>>$@
+    @echo $(DEF10EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT5)"!=""
-    @echo $(DEF10EXPORT5)										>>$@
+    @echo $(DEF10EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT6)"!=""
-    @echo $(DEF10EXPORT6)										>>$@
+    @echo $(DEF10EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT7)"!=""
-    @echo $(DEF10EXPORT7)										>>$@
+    @echo $(DEF10EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT8)"!=""
-    @echo $(DEF10EXPORT8)										>>$@
+    @echo $(DEF10EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT9)"!=""
-    @echo $(DEF10EXPORT9)										>>$@
+    @echo $(DEF10EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT10)"!=""
-    @echo $(DEF10EXPORT10)										>>$@
+    @echo $(DEF10EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT11)"!=""
-    @echo $(DEF10EXPORT11)										>>$@
+    @echo $(DEF10EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT12)"!=""
-    @echo $(DEF10EXPORT12)										>>$@
+    @echo $(DEF10EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT13)"!=""
-    @echo $(DEF10EXPORT13)										>>$@
+    @echo $(DEF10EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT14)"!=""
-    @echo $(DEF10EXPORT14)										>>$@
+    @echo $(DEF10EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT15)"!=""
-    @echo $(DEF10EXPORT15)										>>$@
+    @echo $(DEF10EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT16)"!=""
-    @echo $(DEF10EXPORT16)										>>$@
+    @echo $(DEF10EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT17)"!=""
-    @echo $(DEF10EXPORT17)										>>$@
+    @echo $(DEF10EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT18)"!=""
-    @echo $(DEF10EXPORT18)										>>$@
+    @echo $(DEF10EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT19)"!=""
-    @echo $(DEF10EXPORT19)										>>$@
+    @echo $(DEF10EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT20)"!=""
-    @echo $(DEF10EXPORT20)										>>$@
+    @echo $(DEF10EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORTFILE)"!=""
-    +$(TYPE) $(DEF10EXPORTFILE) >> $@
+    +$(TYPE) $(DEF10EXPORTFILE) >> $@.tmpfile
 .ENDIF
+    @+-$(RM) $@
+    @+$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(APP10HEAP)"==""
 .ENDIF			# "$(GUI)"=="WNT"