Skip to content

C
core
Kaydet (Commit) 7ce8c97b authored tarafından Hans-Joachim Lankenau's avatar Hans-Joachim Lankenau
Dosyalara gözat
Seçenekler

avoid collisions

üst f3e1f0ec
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 406 deletions
solenv/inc/_tg_shl.mk
Dosyayı görüntüle @ 7ce8c97b
...@@ -13,6 +13,13 @@ SHL1ARCHIVES= ...@@ -13,6 +13,13 @@ SHL1ARCHIVES=
SHL1DEF*=$(MISC)$/$(SHL1TARGET).def SHL1DEF*=$(MISC)$/$(SHL1TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
SHL1VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -107,7 +114,8 @@ SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res ...@@ -107,7 +114,8 @@ SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res
.ENDIF # "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL1DESCRIPTION)"=="" .IF "$(NO_SHL1DESCRIPTION)"==""
SHL1DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL1DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL1DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_description.obj
.ENDIF # "$(NO_SHL1DESCRIPTION)"=="" .ENDIF # "$(NO_SHL1DESCRIPTION)"==""
.IF "$(SHL1TARGETN)"!="" .IF "$(SHL1TARGETN)"!=""
...@@ -119,32 +127,19 @@ $(SHL1TARGETN) : \ ...@@ -119,32 +127,19 @@ $(SHL1TARGETN) : \
$(USE_SHL1DEF)\ $(USE_SHL1DEF)\
$(USE_SHL1VERSIONMAP)\ $(USE_SHL1VERSIONMAP)\
$(SHL1RES)\ $(SHL1RES)\
$(SHL1VERSIONH)\
$(SHL1DEPN) $(SHL1DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL1TARGETN) @echo Making: $(SHL1TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -153,13 +148,13 @@ $(SHL1TARGETN) : \ ...@@ -153,13 +148,13 @@ $(SHL1TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL1OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL1VERSIONOBJ:+"+\n") $(SHL1OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL1LIBS:+"+\n") $(SHL1STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL1LIBS:+"+\n") $(SHL1STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL1DEF:+"\n") $(SHL1DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL1LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL1STDLIBS:^"-l") $(SHL1OBJS) $(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL1LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL1STDLIBS:^"-l") $(SHL1OBJS) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1DEF)
.ENDIF .ENDIF
.IF "$(SHL1RES)" != "" .IF "$(SHL1RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL1RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL1RES) $@
...@@ -176,9 +171,9 @@ $(SHL1TARGETN) : \ ...@@ -176,9 +171,9 @@ $(SHL1TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL1DEFAULTRES)"!="" .IF "$(SHL1DEFAULTRES)"!=""
...@@ -215,7 +210,7 @@ $(SHL1TARGETN) : \ ...@@ -215,7 +210,7 @@ $(SHL1TARGETN) : \
-def:$(SHL1DEF) \ -def:$(SHL1DEF) \
$(USE_1IMPLIB) \ $(USE_1IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) \ $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) \
$(SHL1LIBS) \ $(SHL1LIBS) \
$(SHL1STDLIBS) \ $(SHL1STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -226,7 +221,7 @@ $(SHL1TARGETN) : \ ...@@ -226,7 +221,7 @@ $(SHL1TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL1STDLIBS) $(STDSHL) $(SHL1RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL1STDLIBS) $(STDSHL) $(SHL1RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -240,7 +235,7 @@ $(SHL1TARGETN) : \ ...@@ -240,7 +235,7 @@ $(SHL1TARGETN) : \
-def:$(SHL1DEF) \ -def:$(SHL1DEF) \
$(USE_1IMPLIB) \ $(USE_1IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) \ $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) \
$(SHL1LIBS) \ $(SHL1LIBS) \
$(SHL1STDLIBS) \ $(SHL1STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -254,7 +249,7 @@ $(SHL1TARGETN) : \ ...@@ -254,7 +249,7 @@ $(SHL1TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL1IMPLIB).exp \ $(LB)$/$(SHL1IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL1OBJS) $(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \
$(SHL1LIBS) \ $(SHL1LIBS) \
$(SHL1STDLIBS) \ $(SHL1STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -273,7 +268,7 @@ $(SHL1TARGETN) : \ ...@@ -273,7 +268,7 @@ $(SHL1TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL1IMPLIB).exp \ $(LB)$/$(SHL1IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL1OBJS) $(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \
$(SHL1LIBS) \ $(SHL1LIBS) \
$(SHL1STDLIBS) \ $(SHL1STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -308,24 +303,26 @@ $(SHL1TARGETN) : \ ...@@ -308,24 +303,26 @@ $(SHL1TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -348,7 +345,7 @@ $(SHL1TARGETN) : \ ...@@ -348,7 +345,7 @@ $(SHL1TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL1OBJS) `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL1DESCRIPTIONOBJ)) $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL1OBJS) `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ)) $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL1TARGETN)"!="" .ENDIF # "$(SHL1TARGETN)"!=""
...@@ -418,6 +415,13 @@ SHL2ARCHIVES= ...@@ -418,6 +415,13 @@ SHL2ARCHIVES=
SHL2DEF*=$(MISC)$/$(SHL2TARGET).def SHL2DEF*=$(MISC)$/$(SHL2TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
SHL2VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -512,7 +516,8 @@ SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res ...@@ -512,7 +516,8 @@ SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res
.ENDIF # "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL2DESCRIPTION)"=="" .IF "$(NO_SHL2DESCRIPTION)"==""
SHL2DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL2DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL2DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_description.obj
.ENDIF # "$(NO_SHL2DESCRIPTION)"=="" .ENDIF # "$(NO_SHL2DESCRIPTION)"==""
.IF "$(SHL2TARGETN)"!="" .IF "$(SHL2TARGETN)"!=""
...@@ -524,32 +529,19 @@ $(SHL2TARGETN) : \ ...@@ -524,32 +529,19 @@ $(SHL2TARGETN) : \
$(USE_SHL2DEF)\ $(USE_SHL2DEF)\
$(USE_SHL2VERSIONMAP)\ $(USE_SHL2VERSIONMAP)\
$(SHL2RES)\ $(SHL2RES)\
$(SHL2VERSIONH)\
$(SHL2DEPN) $(SHL2DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL2TARGETN) @echo Making: $(SHL2TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -558,13 +550,13 @@ $(SHL2TARGETN) : \ ...@@ -558,13 +550,13 @@ $(SHL2TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL2OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL2VERSIONOBJ:+"+\n") $(SHL2OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL2LIBS:+"+\n") $(SHL2STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL2LIBS:+"+\n") $(SHL2STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL2DEF:+"\n") $(SHL2DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL2LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL2STDLIBS:^"-l") $(SHL2OBJS) $(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL2LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL2STDLIBS:^"-l") $(SHL2OBJS) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2DEF)
.ENDIF .ENDIF
.IF "$(SHL2RES)" != "" .IF "$(SHL2RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL2RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL2RES) $@
...@@ -581,9 +573,9 @@ $(SHL2TARGETN) : \ ...@@ -581,9 +573,9 @@ $(SHL2TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL2DEFAULTRES)"!="" .IF "$(SHL2DEFAULTRES)"!=""
...@@ -620,7 +612,7 @@ $(SHL2TARGETN) : \ ...@@ -620,7 +612,7 @@ $(SHL2TARGETN) : \
-def:$(SHL2DEF) \ -def:$(SHL2DEF) \
$(USE_2IMPLIB) \ $(USE_2IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) \ $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) \
$(SHL2LIBS) \ $(SHL2LIBS) \
$(SHL2STDLIBS) \ $(SHL2STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -631,7 +623,7 @@ $(SHL2TARGETN) : \ ...@@ -631,7 +623,7 @@ $(SHL2TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL2STDLIBS) $(STDSHL) $(SHL2RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL2STDLIBS) $(STDSHL) $(SHL2RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -645,7 +637,7 @@ $(SHL2TARGETN) : \ ...@@ -645,7 +637,7 @@ $(SHL2TARGETN) : \
-def:$(SHL2DEF) \ -def:$(SHL2DEF) \
$(USE_2IMPLIB) \ $(USE_2IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) \ $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) \
$(SHL2LIBS) \ $(SHL2LIBS) \
$(SHL2STDLIBS) \ $(SHL2STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -659,7 +651,7 @@ $(SHL2TARGETN) : \ ...@@ -659,7 +651,7 @@ $(SHL2TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL2IMPLIB).exp \ $(LB)$/$(SHL2IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL2OBJS) $(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \
$(SHL2LIBS) \ $(SHL2LIBS) \
$(SHL2STDLIBS) \ $(SHL2STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -678,7 +670,7 @@ $(SHL2TARGETN) : \ ...@@ -678,7 +670,7 @@ $(SHL2TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL2IMPLIB).exp \ $(LB)$/$(SHL2IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL2OBJS) $(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \
$(SHL2LIBS) \ $(SHL2LIBS) \
$(SHL2STDLIBS) \ $(SHL2STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -713,24 +705,26 @@ $(SHL2TARGETN) : \ ...@@ -713,24 +705,26 @@ $(SHL2TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -753,7 +747,7 @@ $(SHL2TARGETN) : \ ...@@ -753,7 +747,7 @@ $(SHL2TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL2OBJS) `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL2DESCRIPTIONOBJ)) $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL2OBJS) `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ)) $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL2TARGETN)"!="" .ENDIF # "$(SHL2TARGETN)"!=""
...@@ -823,6 +817,13 @@ SHL3ARCHIVES= ...@@ -823,6 +817,13 @@ SHL3ARCHIVES=
SHL3DEF*=$(MISC)$/$(SHL3TARGET).def SHL3DEF*=$(MISC)$/$(SHL3TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
SHL3VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -917,7 +918,8 @@ SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res ...@@ -917,7 +918,8 @@ SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res
.ENDIF # "$(SHL3DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL3DESCRIPTION)"=="" .IF "$(NO_SHL3DESCRIPTION)"==""
SHL3DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL3DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL3DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_description.obj
.ENDIF # "$(NO_SHL3DESCRIPTION)"=="" .ENDIF # "$(NO_SHL3DESCRIPTION)"==""
.IF "$(SHL3TARGETN)"!="" .IF "$(SHL3TARGETN)"!=""
...@@ -929,32 +931,19 @@ $(SHL3TARGETN) : \ ...@@ -929,32 +931,19 @@ $(SHL3TARGETN) : \
$(USE_SHL3DEF)\ $(USE_SHL3DEF)\
$(USE_SHL3VERSIONMAP)\ $(USE_SHL3VERSIONMAP)\
$(SHL3RES)\ $(SHL3RES)\
$(SHL3VERSIONH)\
$(SHL3DEPN) $(SHL3DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL3TARGETN) @echo Making: $(SHL3TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -963,13 +952,13 @@ $(SHL3TARGETN) : \ ...@@ -963,13 +952,13 @@ $(SHL3TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL3OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL3VERSIONOBJ:+"+\n") $(SHL3OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL3LIBS:+"+\n") $(SHL3STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL3LIBS:+"+\n") $(SHL3STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL3DEF:+"\n") $(SHL3DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL3LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL3STDLIBS:^"-l") $(SHL3OBJS) $(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL3LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL3STDLIBS:^"-l") $(SHL3OBJS) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3DEF)
.ENDIF .ENDIF
.IF "$(SHL3RES)" != "" .IF "$(SHL3RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL3RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL3RES) $@
...@@ -986,9 +975,9 @@ $(SHL3TARGETN) : \ ...@@ -986,9 +975,9 @@ $(SHL3TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL3DEFAULTRES)"!="" .IF "$(SHL3DEFAULTRES)"!=""
...@@ -1025,7 +1014,7 @@ $(SHL3TARGETN) : \ ...@@ -1025,7 +1014,7 @@ $(SHL3TARGETN) : \
-def:$(SHL3DEF) \ -def:$(SHL3DEF) \
$(USE_3IMPLIB) \ $(USE_3IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) \ $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) \
$(SHL3LIBS) \ $(SHL3LIBS) \
$(SHL3STDLIBS) \ $(SHL3STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1036,7 +1025,7 @@ $(SHL3TARGETN) : \ ...@@ -1036,7 +1025,7 @@ $(SHL3TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL3STDLIBS) $(STDSHL) $(SHL3RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL3STDLIBS) $(STDSHL) $(SHL3RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -1050,7 +1039,7 @@ $(SHL3TARGETN) : \ ...@@ -1050,7 +1039,7 @@ $(SHL3TARGETN) : \
-def:$(SHL3DEF) \ -def:$(SHL3DEF) \
$(USE_3IMPLIB) \ $(USE_3IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) \ $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) \
$(SHL3LIBS) \ $(SHL3LIBS) \
$(SHL3STDLIBS) \ $(SHL3STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1064,7 +1053,7 @@ $(SHL3TARGETN) : \ ...@@ -1064,7 +1053,7 @@ $(SHL3TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL3IMPLIB).exp \ $(LB)$/$(SHL3IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL3OBJS) $(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \
$(SHL3LIBS) \ $(SHL3LIBS) \
$(SHL3STDLIBS) \ $(SHL3STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1083,7 +1072,7 @@ $(SHL3TARGETN) : \ ...@@ -1083,7 +1072,7 @@ $(SHL3TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL3IMPLIB).exp \ $(LB)$/$(SHL3IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL3OBJS) $(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \
$(SHL3LIBS) \ $(SHL3LIBS) \
$(SHL3STDLIBS) \ $(SHL3STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1118,24 +1107,26 @@ $(SHL3TARGETN) : \ ...@@ -1118,24 +1107,26 @@ $(SHL3TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -1158,7 +1149,7 @@ $(SHL3TARGETN) : \ ...@@ -1158,7 +1149,7 @@ $(SHL3TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL3OBJS) `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL3DESCRIPTIONOBJ)) $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL3OBJS) `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ)) $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL3TARGETN)"!="" .ENDIF # "$(SHL3TARGETN)"!=""
...@@ -1228,6 +1219,13 @@ SHL4ARCHIVES= ...@@ -1228,6 +1219,13 @@ SHL4ARCHIVES=
SHL4DEF*=$(MISC)$/$(SHL4TARGET).def SHL4DEF*=$(MISC)$/$(SHL4TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
SHL4VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -1322,7 +1320,8 @@ SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res ...@@ -1322,7 +1320,8 @@ SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res
.ENDIF # "$(SHL4DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL4DESCRIPTION)"=="" .IF "$(NO_SHL4DESCRIPTION)"==""
SHL4DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL4DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL4DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_description.obj
.ENDIF # "$(NO_SHL4DESCRIPTION)"=="" .ENDIF # "$(NO_SHL4DESCRIPTION)"==""
.IF "$(SHL4TARGETN)"!="" .IF "$(SHL4TARGETN)"!=""
...@@ -1334,32 +1333,19 @@ $(SHL4TARGETN) : \ ...@@ -1334,32 +1333,19 @@ $(SHL4TARGETN) : \
$(USE_SHL4DEF)\ $(USE_SHL4DEF)\
$(USE_SHL4VERSIONMAP)\ $(USE_SHL4VERSIONMAP)\
$(SHL4RES)\ $(SHL4RES)\
$(SHL4VERSIONH)\
$(SHL4DEPN) $(SHL4DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL4TARGETN) @echo Making: $(SHL4TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -1368,13 +1354,13 @@ $(SHL4TARGETN) : \ ...@@ -1368,13 +1354,13 @@ $(SHL4TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL4OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL4VERSIONOBJ:+"+\n") $(SHL4OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL4LIBS:+"+\n") $(SHL4STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL4LIBS:+"+\n") $(SHL4STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL4DEF:+"\n") $(SHL4DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL4LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL4STDLIBS:^"-l") $(SHL4OBJS) $(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL4LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL4STDLIBS:^"-l") $(SHL4OBJS) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4DEF)
.ENDIF .ENDIF
.IF "$(SHL4RES)" != "" .IF "$(SHL4RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL4RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL4RES) $@
...@@ -1391,9 +1377,9 @@ $(SHL4TARGETN) : \ ...@@ -1391,9 +1377,9 @@ $(SHL4TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL4DEFAULTRES)"!="" .IF "$(SHL4DEFAULTRES)"!=""
...@@ -1430,7 +1416,7 @@ $(SHL4TARGETN) : \ ...@@ -1430,7 +1416,7 @@ $(SHL4TARGETN) : \
-def:$(SHL4DEF) \ -def:$(SHL4DEF) \
$(USE_4IMPLIB) \ $(USE_4IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) \ $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) \
$(SHL4LIBS) \ $(SHL4LIBS) \
$(SHL4STDLIBS) \ $(SHL4STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1441,7 +1427,7 @@ $(SHL4TARGETN) : \ ...@@ -1441,7 +1427,7 @@ $(SHL4TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL4STDLIBS) $(STDSHL) $(SHL4RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL4STDLIBS) $(STDSHL) $(SHL4RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -1455,7 +1441,7 @@ $(SHL4TARGETN) : \ ...@@ -1455,7 +1441,7 @@ $(SHL4TARGETN) : \
-def:$(SHL4DEF) \ -def:$(SHL4DEF) \
$(USE_4IMPLIB) \ $(USE_4IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) \ $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) \
$(SHL4LIBS) \ $(SHL4LIBS) \
$(SHL4STDLIBS) \ $(SHL4STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1469,7 +1455,7 @@ $(SHL4TARGETN) : \ ...@@ -1469,7 +1455,7 @@ $(SHL4TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL4IMPLIB).exp \ $(LB)$/$(SHL4IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL4OBJS) $(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \ $(SHL4OBJS) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \
$(SHL4LIBS) \ $(SHL4LIBS) \
$(SHL4STDLIBS) \ $(SHL4STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1488,7 +1474,7 @@ $(SHL4TARGETN) : \ ...@@ -1488,7 +1474,7 @@ $(SHL4TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL4IMPLIB).exp \ $(LB)$/$(SHL4IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL4OBJS) $(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \ $(SHL4OBJS) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \
$(SHL4LIBS) \ $(SHL4LIBS) \
$(SHL4STDLIBS) \ $(SHL4STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1523,24 +1509,26 @@ $(SHL4TARGETN) : \ ...@@ -1523,24 +1509,26 @@ $(SHL4TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="LINUX" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="NETBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -1563,7 +1551,7 @@ $(SHL4TARGETN) : \ ...@@ -1563,7 +1551,7 @@ $(SHL4TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL4OBJS) `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL4DESCRIPTIONOBJ)) $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL4OBJS) `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ)) $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL4TARGETN)"!="" .ENDIF # "$(SHL4TARGETN)"!=""
...@@ -1633,6 +1621,13 @@ SHL5ARCHIVES= ...@@ -1633,6 +1621,13 @@ SHL5ARCHIVES=
SHL5DEF*=$(MISC)$/$(SHL5TARGET).def SHL5DEF*=$(MISC)$/$(SHL5TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
SHL5VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -1727,7 +1722,8 @@ SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res ...@@ -1727,7 +1722,8 @@ SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res
.ENDIF # "$(SHL5DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL5DESCRIPTION)"=="" .IF "$(NO_SHL5DESCRIPTION)"==""
SHL5DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL5DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL5DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_description.obj
.ENDIF # "$(NO_SHL5DESCRIPTION)"=="" .ENDIF # "$(NO_SHL5DESCRIPTION)"==""
.IF "$(SHL5TARGETN)"!="" .IF "$(SHL5TARGETN)"!=""
...@@ -1739,32 +1735,19 @@ $(SHL5TARGETN) : \ ...@@ -1739,32 +1735,19 @@ $(SHL5TARGETN) : \
$(USE_SHL5DEF)\ $(USE_SHL5DEF)\
$(USE_SHL5VERSIONMAP)\ $(USE_SHL5VERSIONMAP)\
$(SHL5RES)\ $(SHL5RES)\
$(SHL5VERSIONH)\
$(SHL5DEPN) $(SHL5DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL5TARGETN) @echo Making: $(SHL5TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -1773,13 +1756,13 @@ $(SHL5TARGETN) : \ ...@@ -1773,13 +1756,13 @@ $(SHL5TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL5OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL5VERSIONOBJ:+"+\n") $(SHL5OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL5LIBS:+"+\n") $(SHL5STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL5LIBS:+"+\n") $(SHL5STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL5DEF:+"\n") $(SHL5DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL5LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL5STDLIBS:^"-l") $(SHL5OBJS) $(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL5LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL5STDLIBS:^"-l") $(SHL5OBJS) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5DEF)
.ENDIF .ENDIF
.IF "$(SHL5RES)" != "" .IF "$(SHL5RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL5RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL5RES) $@
...@@ -1796,9 +1779,9 @@ $(SHL5TARGETN) : \ ...@@ -1796,9 +1779,9 @@ $(SHL5TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL5DEFAULTRES)"!="" .IF "$(SHL5DEFAULTRES)"!=""
...@@ -1835,7 +1818,7 @@ $(SHL5TARGETN) : \ ...@@ -1835,7 +1818,7 @@ $(SHL5TARGETN) : \
-def:$(SHL5DEF) \ -def:$(SHL5DEF) \
$(USE_5IMPLIB) \ $(USE_5IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) \ $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) \
$(SHL5LIBS) \ $(SHL5LIBS) \
$(SHL5STDLIBS) \ $(SHL5STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1846,7 +1829,7 @@ $(SHL5TARGETN) : \ ...@@ -1846,7 +1829,7 @@ $(SHL5TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL5STDLIBS) $(STDSHL) $(SHL5RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL5STDLIBS) $(STDSHL) $(SHL5RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -1860,7 +1843,7 @@ $(SHL5TARGETN) : \ ...@@ -1860,7 +1843,7 @@ $(SHL5TARGETN) : \
-def:$(SHL5DEF) \ -def:$(SHL5DEF) \
$(USE_5IMPLIB) \ $(USE_5IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) \ $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) \
$(SHL5LIBS) \ $(SHL5LIBS) \
$(SHL5STDLIBS) \ $(SHL5STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1874,7 +1857,7 @@ $(SHL5TARGETN) : \ ...@@ -1874,7 +1857,7 @@ $(SHL5TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL5IMPLIB).exp \ $(LB)$/$(SHL5IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL5OBJS) $(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \ $(SHL5OBJS) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \
$(SHL5LIBS) \ $(SHL5LIBS) \
$(SHL5STDLIBS) \ $(SHL5STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1893,7 +1876,7 @@ $(SHL5TARGETN) : \ ...@@ -1893,7 +1876,7 @@ $(SHL5TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL5IMPLIB).exp \ $(LB)$/$(SHL5IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL5OBJS) $(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \ $(SHL5OBJS) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \
$(SHL5LIBS) \ $(SHL5LIBS) \
$(SHL5STDLIBS) \ $(SHL5STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -1928,24 +1911,26 @@ $(SHL5TARGETN) : \ ...@@ -1928,24 +1911,26 @@ $(SHL5TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -1968,7 +1953,7 @@ $(SHL5TARGETN) : \ ...@@ -1968,7 +1953,7 @@ $(SHL5TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL5OBJS) `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL5DESCRIPTIONOBJ)) $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL5OBJS) `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ)) $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL5TARGETN)"!="" .ENDIF # "$(SHL5TARGETN)"!=""
...@@ -2038,6 +2023,13 @@ SHL6ARCHIVES= ...@@ -2038,6 +2023,13 @@ SHL6ARCHIVES=
SHL6DEF*=$(MISC)$/$(SHL6TARGET).def SHL6DEF*=$(MISC)$/$(SHL6TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
SHL6VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -2132,7 +2124,8 @@ SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res ...@@ -2132,7 +2124,8 @@ SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res
.ENDIF # "$(SHL6DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL6DESCRIPTION)"=="" .IF "$(NO_SHL6DESCRIPTION)"==""
SHL6DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL6DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL6DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_description.obj
.ENDIF # "$(NO_SHL6DESCRIPTION)"=="" .ENDIF # "$(NO_SHL6DESCRIPTION)"==""
.IF "$(SHL6TARGETN)"!="" .IF "$(SHL6TARGETN)"!=""
...@@ -2144,32 +2137,19 @@ $(SHL6TARGETN) : \ ...@@ -2144,32 +2137,19 @@ $(SHL6TARGETN) : \
$(USE_SHL6DEF)\ $(USE_SHL6DEF)\
$(USE_SHL6VERSIONMAP)\ $(USE_SHL6VERSIONMAP)\
$(SHL6RES)\ $(SHL6RES)\
$(SHL6VERSIONH)\
$(SHL6DEPN) $(SHL6DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL6TARGETN) @echo Making: $(SHL6TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -2178,13 +2158,13 @@ $(SHL6TARGETN) : \ ...@@ -2178,13 +2158,13 @@ $(SHL6TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL6OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL6VERSIONOBJ:+"+\n") $(SHL6OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL6LIBS:+"+\n") $(SHL6STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL6LIBS:+"+\n") $(SHL6STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL6DEF:+"\n") $(SHL6DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL6LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL6STDLIBS:^"-l") $(SHL6OBJS) $(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL6LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL6STDLIBS:^"-l") $(SHL6OBJS) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6DEF)
.ENDIF .ENDIF
.IF "$(SHL6RES)" != "" .IF "$(SHL6RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL6RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL6RES) $@
...@@ -2201,9 +2181,9 @@ $(SHL6TARGETN) : \ ...@@ -2201,9 +2181,9 @@ $(SHL6TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL6DEFAULTRES)"!="" .IF "$(SHL6DEFAULTRES)"!=""
...@@ -2240,7 +2220,7 @@ $(SHL6TARGETN) : \ ...@@ -2240,7 +2220,7 @@ $(SHL6TARGETN) : \
-def:$(SHL6DEF) \ -def:$(SHL6DEF) \
$(USE_6IMPLIB) \ $(USE_6IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) \ $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) \
$(SHL6LIBS) \ $(SHL6LIBS) \
$(SHL6STDLIBS) \ $(SHL6STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2251,7 +2231,7 @@ $(SHL6TARGETN) : \ ...@@ -2251,7 +2231,7 @@ $(SHL6TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL6STDLIBS) $(STDSHL) $(SHL6RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL6STDLIBS) $(STDSHL) $(SHL6RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -2265,7 +2245,7 @@ $(SHL6TARGETN) : \ ...@@ -2265,7 +2245,7 @@ $(SHL6TARGETN) : \
-def:$(SHL6DEF) \ -def:$(SHL6DEF) \
$(USE_6IMPLIB) \ $(USE_6IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) \ $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) \
$(SHL6LIBS) \ $(SHL6LIBS) \
$(SHL6STDLIBS) \ $(SHL6STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2279,7 +2259,7 @@ $(SHL6TARGETN) : \ ...@@ -2279,7 +2259,7 @@ $(SHL6TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL6IMPLIB).exp \ $(LB)$/$(SHL6IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL6OBJS) $(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \ $(SHL6OBJS) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \
$(SHL6LIBS) \ $(SHL6LIBS) \
$(SHL6STDLIBS) \ $(SHL6STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2298,7 +2278,7 @@ $(SHL6TARGETN) : \ ...@@ -2298,7 +2278,7 @@ $(SHL6TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL6IMPLIB).exp \ $(LB)$/$(SHL6IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL6OBJS) $(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \ $(SHL6OBJS) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \
$(SHL6LIBS) \ $(SHL6LIBS) \
$(SHL6STDLIBS) \ $(SHL6STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2333,24 +2313,26 @@ $(SHL6TARGETN) : \ ...@@ -2333,24 +2313,26 @@ $(SHL6TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -2373,7 +2355,7 @@ $(SHL6TARGETN) : \ ...@@ -2373,7 +2355,7 @@ $(SHL6TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL6OBJS) `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL6DESCRIPTIONOBJ)) $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL6OBJS) `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ)) $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL6TARGETN)"!="" .ENDIF # "$(SHL6TARGETN)"!=""
...@@ -2443,6 +2425,13 @@ SHL7ARCHIVES= ...@@ -2443,6 +2425,13 @@ SHL7ARCHIVES=
SHL7DEF*=$(MISC)$/$(SHL7TARGET).def SHL7DEF*=$(MISC)$/$(SHL7TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
SHL7VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -2537,7 +2526,8 @@ SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res ...@@ -2537,7 +2526,8 @@ SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res
.ENDIF # "$(SHL7DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL7DESCRIPTION)"=="" .IF "$(NO_SHL7DESCRIPTION)"==""
SHL7DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL7DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL7DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_description.obj
.ENDIF # "$(NO_SHL7DESCRIPTION)"=="" .ENDIF # "$(NO_SHL7DESCRIPTION)"==""
.IF "$(SHL7TARGETN)"!="" .IF "$(SHL7TARGETN)"!=""
...@@ -2549,32 +2539,19 @@ $(SHL7TARGETN) : \ ...@@ -2549,32 +2539,19 @@ $(SHL7TARGETN) : \
$(USE_SHL7DEF)\ $(USE_SHL7DEF)\
$(USE_SHL7VERSIONMAP)\ $(USE_SHL7VERSIONMAP)\
$(SHL7RES)\ $(SHL7RES)\
$(SHL7VERSIONH)\
$(SHL7DEPN) $(SHL7DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL7TARGETN) @echo Making: $(SHL7TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -2583,13 +2560,13 @@ $(SHL7TARGETN) : \ ...@@ -2583,13 +2560,13 @@ $(SHL7TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL7OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL7VERSIONOBJ:+"+\n") $(SHL7OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL7LIBS:+"+\n") $(SHL7STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL7LIBS:+"+\n") $(SHL7STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL7DEF:+"\n") $(SHL7DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL7LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL7STDLIBS:^"-l") $(SHL7OBJS) $(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL7LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL7STDLIBS:^"-l") $(SHL7OBJS) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7DEF)
.ENDIF .ENDIF
.IF "$(SHL7RES)" != "" .IF "$(SHL7RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL7RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL7RES) $@
...@@ -2606,9 +2583,9 @@ $(SHL7TARGETN) : \ ...@@ -2606,9 +2583,9 @@ $(SHL7TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL7DEFAULTRES)"!="" .IF "$(SHL7DEFAULTRES)"!=""
...@@ -2645,7 +2622,7 @@ $(SHL7TARGETN) : \ ...@@ -2645,7 +2622,7 @@ $(SHL7TARGETN) : \
-def:$(SHL7DEF) \ -def:$(SHL7DEF) \
$(USE_7IMPLIB) \ $(USE_7IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) \ $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) \
$(SHL7LIBS) \ $(SHL7LIBS) \
$(SHL7STDLIBS) \ $(SHL7STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2656,7 +2633,7 @@ $(SHL7TARGETN) : \ ...@@ -2656,7 +2633,7 @@ $(SHL7TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL7STDLIBS) $(STDSHL) $(SHL7RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL7STDLIBS) $(STDSHL) $(SHL7RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -2670,7 +2647,7 @@ $(SHL7TARGETN) : \ ...@@ -2670,7 +2647,7 @@ $(SHL7TARGETN) : \
-def:$(SHL7DEF) \ -def:$(SHL7DEF) \
$(USE_7IMPLIB) \ $(USE_7IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) \ $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) \
$(SHL7LIBS) \ $(SHL7LIBS) \
$(SHL7STDLIBS) \ $(SHL7STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2684,7 +2661,7 @@ $(SHL7TARGETN) : \ ...@@ -2684,7 +2661,7 @@ $(SHL7TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL7IMPLIB).exp \ $(LB)$/$(SHL7IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL7OBJS) $(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \ $(SHL7OBJS) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \
$(SHL7LIBS) \ $(SHL7LIBS) \
$(SHL7STDLIBS) \ $(SHL7STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2703,7 +2680,7 @@ $(SHL7TARGETN) : \ ...@@ -2703,7 +2680,7 @@ $(SHL7TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL7IMPLIB).exp \ $(LB)$/$(SHL7IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL7OBJS) $(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \ $(SHL7OBJS) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \
$(SHL7LIBS) \ $(SHL7LIBS) \
$(SHL7STDLIBS) \ $(SHL7STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -2738,24 +2715,26 @@ $(SHL7TARGETN) : \ ...@@ -2738,24 +2715,26 @@ $(SHL7TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -2778,7 +2757,7 @@ $(SHL7TARGETN) : \ ...@@ -2778,7 +2757,7 @@ $(SHL7TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL7OBJS) `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL7DESCRIPTIONOBJ)) $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL7OBJS) `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ)) $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL7TARGETN)"!="" .ENDIF # "$(SHL7TARGETN)"!=""
...@@ -2848,6 +2827,13 @@ SHL8ARCHIVES= ...@@ -2848,6 +2827,13 @@ SHL8ARCHIVES=
SHL8DEF*=$(MISC)$/$(SHL8TARGET).def SHL8DEF*=$(MISC)$/$(SHL8TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
SHL8VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -2942,7 +2928,8 @@ SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res ...@@ -2942,7 +2928,8 @@ SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res
.ENDIF # "$(SHL8DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL8DESCRIPTION)"=="" .IF "$(NO_SHL8DESCRIPTION)"==""
SHL8DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL8DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL8DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_description.obj
.ENDIF # "$(NO_SHL8DESCRIPTION)"=="" .ENDIF # "$(NO_SHL8DESCRIPTION)"==""
.IF "$(SHL8TARGETN)"!="" .IF "$(SHL8TARGETN)"!=""
...@@ -2954,32 +2941,19 @@ $(SHL8TARGETN) : \ ...@@ -2954,32 +2941,19 @@ $(SHL8TARGETN) : \
$(USE_SHL8DEF)\ $(USE_SHL8DEF)\
$(USE_SHL8VERSIONMAP)\ $(USE_SHL8VERSIONMAP)\
$(SHL8RES)\ $(SHL8RES)\
$(SHL8VERSIONH)\
$(SHL8DEPN) $(SHL8DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL8TARGETN) @echo Making: $(SHL8TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -2988,13 +2962,13 @@ $(SHL8TARGETN) : \ ...@@ -2988,13 +2962,13 @@ $(SHL8TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL8OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL8VERSIONOBJ:+"+\n") $(SHL8OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL8LIBS:+"+\n") $(SHL8STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL8LIBS:+"+\n") $(SHL8STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL8DEF:+"\n") $(SHL8DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL8LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL8STDLIBS:^"-l") $(SHL8OBJS) $(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL8LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL8STDLIBS:^"-l") $(SHL8OBJS) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8DEF)
.ENDIF .ENDIF
.IF "$(SHL8RES)" != "" .IF "$(SHL8RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL8RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL8RES) $@
...@@ -3011,9 +2985,9 @@ $(SHL8TARGETN) : \ ...@@ -3011,9 +2985,9 @@ $(SHL8TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL8DEFAULTRES)"!="" .IF "$(SHL8DEFAULTRES)"!=""
...@@ -3050,7 +3024,7 @@ $(SHL8TARGETN) : \ ...@@ -3050,7 +3024,7 @@ $(SHL8TARGETN) : \
-def:$(SHL8DEF) \ -def:$(SHL8DEF) \
$(USE_8IMPLIB) \ $(USE_8IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) \ $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) \
$(SHL8LIBS) \ $(SHL8LIBS) \
$(SHL8STDLIBS) \ $(SHL8STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3061,7 +3035,7 @@ $(SHL8TARGETN) : \ ...@@ -3061,7 +3035,7 @@ $(SHL8TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL8STDLIBS) $(STDSHL) $(SHL8RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL8STDLIBS) $(STDSHL) $(SHL8RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -3075,7 +3049,7 @@ $(SHL8TARGETN) : \ ...@@ -3075,7 +3049,7 @@ $(SHL8TARGETN) : \
-def:$(SHL8DEF) \ -def:$(SHL8DEF) \
$(USE_8IMPLIB) \ $(USE_8IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) \ $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) \
$(SHL8LIBS) \ $(SHL8LIBS) \
$(SHL8STDLIBS) \ $(SHL8STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3089,7 +3063,7 @@ $(SHL8TARGETN) : \ ...@@ -3089,7 +3063,7 @@ $(SHL8TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL8IMPLIB).exp \ $(LB)$/$(SHL8IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL8OBJS) $(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \ $(SHL8OBJS) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \
$(SHL8LIBS) \ $(SHL8LIBS) \
$(SHL8STDLIBS) \ $(SHL8STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3108,7 +3082,7 @@ $(SHL8TARGETN) : \ ...@@ -3108,7 +3082,7 @@ $(SHL8TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL8IMPLIB).exp \ $(LB)$/$(SHL8IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL8OBJS) $(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \ $(SHL8OBJS) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \
$(SHL8LIBS) \ $(SHL8LIBS) \
$(SHL8STDLIBS) \ $(SHL8STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3143,24 +3117,26 @@ $(SHL8TARGETN) : \ ...@@ -3143,24 +3117,26 @@ $(SHL8TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -3183,7 +3159,7 @@ $(SHL8TARGETN) : \ ...@@ -3183,7 +3159,7 @@ $(SHL8TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL8OBJS) `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL8DESCRIPTIONOBJ)) $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL8OBJS) `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ)) $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL8TARGETN)"!="" .ENDIF # "$(SHL8TARGETN)"!=""
...@@ -3253,6 +3229,13 @@ SHL9ARCHIVES= ...@@ -3253,6 +3229,13 @@ SHL9ARCHIVES=
SHL9DEF*=$(MISC)$/$(SHL9TARGET).def SHL9DEF*=$(MISC)$/$(SHL9TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
SHL9VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -3347,7 +3330,8 @@ SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res ...@@ -3347,7 +3330,8 @@ SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res
.ENDIF # "$(SHL9DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL9DESCRIPTION)"=="" .IF "$(NO_SHL9DESCRIPTION)"==""
SHL9DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL9DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL9DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_description.obj
.ENDIF # "$(NO_SHL9DESCRIPTION)"=="" .ENDIF # "$(NO_SHL9DESCRIPTION)"==""
.IF "$(SHL9TARGETN)"!="" .IF "$(SHL9TARGETN)"!=""
...@@ -3359,32 +3343,19 @@ $(SHL9TARGETN) : \ ...@@ -3359,32 +3343,19 @@ $(SHL9TARGETN) : \
$(USE_SHL9DEF)\ $(USE_SHL9DEF)\
$(USE_SHL9VERSIONMAP)\ $(USE_SHL9VERSIONMAP)\
$(SHL9RES)\ $(SHL9RES)\
$(SHL9VERSIONH)\
$(SHL9DEPN) $(SHL9DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL9TARGETN) @echo Making: $(SHL9TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -3393,13 +3364,13 @@ $(SHL9TARGETN) : \ ...@@ -3393,13 +3364,13 @@ $(SHL9TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL9OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL9VERSIONOBJ:+"+\n") $(SHL9OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL9LIBS:+"+\n") $(SHL9STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL9LIBS:+"+\n") $(SHL9STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL9DEF:+"\n") $(SHL9DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL9LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL9STDLIBS:^"-l") $(SHL9OBJS) $(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL9LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL9STDLIBS:^"-l") $(SHL9OBJS) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9DEF)
.ENDIF .ENDIF
.IF "$(SHL9RES)" != "" .IF "$(SHL9RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL9RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL9RES) $@
...@@ -3416,9 +3387,9 @@ $(SHL9TARGETN) : \ ...@@ -3416,9 +3387,9 @@ $(SHL9TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL9DEFAULTRES)"!="" .IF "$(SHL9DEFAULTRES)"!=""
...@@ -3455,7 +3426,7 @@ $(SHL9TARGETN) : \ ...@@ -3455,7 +3426,7 @@ $(SHL9TARGETN) : \
-def:$(SHL9DEF) \ -def:$(SHL9DEF) \
$(USE_9IMPLIB) \ $(USE_9IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) \ $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) \
$(SHL9LIBS) \ $(SHL9LIBS) \
$(SHL9STDLIBS) \ $(SHL9STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3466,7 +3437,7 @@ $(SHL9TARGETN) : \ ...@@ -3466,7 +3437,7 @@ $(SHL9TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL9STDLIBS) $(STDSHL) $(SHL9RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL9STDLIBS) $(STDSHL) $(SHL9RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -3480,7 +3451,7 @@ $(SHL9TARGETN) : \ ...@@ -3480,7 +3451,7 @@ $(SHL9TARGETN) : \
-def:$(SHL9DEF) \ -def:$(SHL9DEF) \
$(USE_9IMPLIB) \ $(USE_9IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) \ $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) \
$(SHL9LIBS) \ $(SHL9LIBS) \
$(SHL9STDLIBS) \ $(SHL9STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3494,7 +3465,7 @@ $(SHL9TARGETN) : \ ...@@ -3494,7 +3465,7 @@ $(SHL9TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL9IMPLIB).exp \ $(LB)$/$(SHL9IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL9OBJS) $(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \ $(SHL9OBJS) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \
$(SHL9LIBS) \ $(SHL9LIBS) \
$(SHL9STDLIBS) \ $(SHL9STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3513,7 +3484,7 @@ $(SHL9TARGETN) : \ ...@@ -3513,7 +3484,7 @@ $(SHL9TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL9IMPLIB).exp \ $(LB)$/$(SHL9IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL9OBJS) $(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \ $(SHL9OBJS) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \
$(SHL9LIBS) \ $(SHL9LIBS) \
$(SHL9STDLIBS) \ $(SHL9STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3548,24 +3519,26 @@ $(SHL9TARGETN) : \ ...@@ -3548,24 +3519,26 @@ $(SHL9TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="LINUX" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="NETBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -3588,7 +3561,7 @@ $(SHL9TARGETN) : \ ...@@ -3588,7 +3561,7 @@ $(SHL9TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL9OBJS) `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL9DESCRIPTIONOBJ)) $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL9OBJS) `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ)) $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL9TARGETN)"!="" .ENDIF # "$(SHL9TARGETN)"!=""
...@@ -3658,6 +3631,13 @@ SHL10ARCHIVES= ...@@ -3658,6 +3631,13 @@ SHL10ARCHIVES=
SHL10DEF*=$(MISC)$/$(SHL10TARGET).def SHL10DEF*=$(MISC)$/$(SHL10TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
SHL10VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -3752,7 +3732,8 @@ SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res ...@@ -3752,7 +3732,8 @@ SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res
.ENDIF # "$(SHL10DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL10DESCRIPTION)"=="" .IF "$(NO_SHL10DESCRIPTION)"==""
SHL10DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL10DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL10DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_description.obj
.ENDIF # "$(NO_SHL10DESCRIPTION)"=="" .ENDIF # "$(NO_SHL10DESCRIPTION)"==""
.IF "$(SHL10TARGETN)"!="" .IF "$(SHL10TARGETN)"!=""
...@@ -3764,32 +3745,19 @@ $(SHL10TARGETN) : \ ...@@ -3764,32 +3745,19 @@ $(SHL10TARGETN) : \
$(USE_SHL10DEF)\ $(USE_SHL10DEF)\
$(USE_SHL10VERSIONMAP)\ $(USE_SHL10VERSIONMAP)\
$(SHL10RES)\ $(SHL10RES)\
$(SHL10VERSIONH)\
$(SHL10DEPN) $(SHL10DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL10TARGETN) @echo Making: $(SHL10TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -3798,13 +3766,13 @@ $(SHL10TARGETN) : \ ...@@ -3798,13 +3766,13 @@ $(SHL10TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL10OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL10VERSIONOBJ:+"+\n") $(SHL10OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL10LIBS:+"+\n") $(SHL10STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL10LIBS:+"+\n") $(SHL10STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL10DEF:+"\n") $(SHL10DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL10LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL10STDLIBS:^"-l") $(SHL10OBJS) $(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL10LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL10STDLIBS:^"-l") $(SHL10OBJS) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10DEF)
.ENDIF .ENDIF
.IF "$(SHL10RES)" != "" .IF "$(SHL10RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL10RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL10RES) $@
...@@ -3821,9 +3789,9 @@ $(SHL10TARGETN) : \ ...@@ -3821,9 +3789,9 @@ $(SHL10TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL10DEFAULTRES)"!="" .IF "$(SHL10DEFAULTRES)"!=""
...@@ -3860,7 +3828,7 @@ $(SHL10TARGETN) : \ ...@@ -3860,7 +3828,7 @@ $(SHL10TARGETN) : \
-def:$(SHL10DEF) \ -def:$(SHL10DEF) \
$(USE_10IMPLIB) \ $(USE_10IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) \ $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) \
$(SHL10LIBS) \ $(SHL10LIBS) \
$(SHL10STDLIBS) \ $(SHL10STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3871,7 +3839,7 @@ $(SHL10TARGETN) : \ ...@@ -3871,7 +3839,7 @@ $(SHL10TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL10STDLIBS) $(STDSHL) $(SHL10RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL10STDLIBS) $(STDSHL) $(SHL10RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -3885,7 +3853,7 @@ $(SHL10TARGETN) : \ ...@@ -3885,7 +3853,7 @@ $(SHL10TARGETN) : \
-def:$(SHL10DEF) \ -def:$(SHL10DEF) \
$(USE_10IMPLIB) \ $(USE_10IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) \ $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) \
$(SHL10LIBS) \ $(SHL10LIBS) \
$(SHL10STDLIBS) \ $(SHL10STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3899,7 +3867,7 @@ $(SHL10TARGETN) : \ ...@@ -3899,7 +3867,7 @@ $(SHL10TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL10IMPLIB).exp \ $(LB)$/$(SHL10IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL10OBJS) $(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \ $(SHL10OBJS) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \
$(SHL10LIBS) \ $(SHL10LIBS) \
$(SHL10STDLIBS) \ $(SHL10STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3918,7 +3886,7 @@ $(SHL10TARGETN) : \ ...@@ -3918,7 +3886,7 @@ $(SHL10TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL10IMPLIB).exp \ $(LB)$/$(SHL10IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL10OBJS) $(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \ $(SHL10OBJS) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \
$(SHL10LIBS) \ $(SHL10LIBS) \
$(SHL10STDLIBS) \ $(SHL10STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -3953,24 +3921,26 @@ $(SHL10TARGETN) : \ ...@@ -3953,24 +3921,26 @@ $(SHL10TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF
.IF "$(OS)"=="LINUX"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="NETBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -3993,7 +3963,7 @@ $(SHL10TARGETN) : \ ...@@ -3993,7 +3963,7 @@ $(SHL10TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL10OBJS) `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL10DESCRIPTIONOBJ)) $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL10OBJS) `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ)) $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL10TARGETN)"!="" .ENDIF # "$(SHL10TARGETN)"!=""
......
solenv/inc/tg_shl.mk
Dosyayı görüntüle @ 7ce8c97b
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: tg_shl.mk,v $ # $RCSfile: tg_shl.mk,v $
# #
# $Revision: 1.12 $ # $Revision: 1.13 $
# #
# last change: $Author: svesik $ $Date: 2000-12-06 19:17:15 $ # last change: $Author: hjs $ $Date: 2000-12-21 20:06:31 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -113,6 +113,13 @@ SHL$(TNR)ARCHIVES= ...@@ -113,6 +113,13 @@ SHL$(TNR)ARCHIVES=
SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def
.IF "$(UPDATER)"=="YES"
.IF "$(VERSIONOBJ)"!=""
SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
SHL$(TNR)VERSIONH:=$(INCCOM)$/_version.h
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(GUI)" != "UNX" .IF "$(GUI)" != "UNX"
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"
...@@ -207,7 +214,8 @@ SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res ...@@ -207,7 +214,8 @@ SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res
.ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
.IF "$(NO_SHL$(TNR)DESCRIPTION)"=="" .IF "$(NO_SHL$(TNR)DESCRIPTION)"==""
SHL$(TNR)DESCRIPTIONOBJ*=$(SLO)$/default_description.obj #SHL$(TNR)DESCRIPTIONOBJ*=$(SLO)$/default_description.obj
SHL$(TNR)DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_description.obj
.ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"=="" .ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"==""
.IF "$(SHL$(TNR)TARGETN)"!="" .IF "$(SHL$(TNR)TARGETN)"!=""
...@@ -219,32 +227,19 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -219,32 +227,19 @@ $(SHL$(TNR)TARGETN) : \
$(USE_SHL$(TNR)DEF)\ $(USE_SHL$(TNR)DEF)\
$(USE_SHL$(TNR)VERSIONMAP)\ $(USE_SHL$(TNR)VERSIONMAP)\
$(SHL$(TNR)RES)\ $(SHL$(TNR)RES)\
$(SHL$(TNR)VERSIONH)\
$(SHL$(TNR)DEPN) $(SHL$(TNR)DEPN)
@echo ------------------------------ @echo ------------------------------
@echo Making: $(SHL$(TNR)TARGETN) @echo Making: $(SHL$(TNR)TARGETN)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(GUI)"=="UNX" @-+$(RM) $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj
@+echo "#define" _BUILD \"$(BUILD)\" > $(INCCOM)$/_version.h
@+echo "#define" _UPD \"$(UPD)\" >> $(INCCOM)$/_version.h
@+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\' >> $(INCCOM)$/_version.h
@+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $(INCCOM)$/_version.h
@+echo "#define" _INPATH \"$(INPATH)\" >> $(INCCOM)$/_version.h
.ELSE
@+echo #define _BUILD "$(BUILD)" > $(INCCOM)$/_version.h
@+echo #define _UPD "$(UPD)" >> $(INCCOM)$/_version.h
@+echo #define _LAST_MINOR '$(LAST_MINOR)' >> $(INCCOM)$/_version.h
@+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $(INCCOM)$/_version.h
@+echo #define _RSCREVISION "$(RSCREVISION)">> $(INCCOM)$/_version.h
@+echo #define _INPATH "$(INPATH)" >> $(INCCOM)$/_version.h
.ENDIF
@-+$(RM) $(SLO)$/_version.obj
.ENDIF .ENDIF
.IF "$(GUI)"=="OS2" .IF "$(GUI)"=="OS2"
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(CC) -c -Fo$(SLO)$/_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj /Ge+ /Gs+ /Gt+ /Gd+ -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE # "$(COM)"=="ICC" .ELSE # "$(COM)"=="ICC"
$(CC) -c -o$(SLO)$/_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -Zomf -Zso -Zsys -DOS2 $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="ICC" .ENDIF # "$(COM)"=="ICC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
# #
...@@ -253,13 +248,13 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -253,13 +248,13 @@ $(SHL$(TNR)TARGETN) : \
+-$(RM) $@ +-$(RM) $@
.IF "$(COM)"=="ICC" .IF "$(COM)"=="ICC"
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \ $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) @$(mktmp \
$(STDSLO:+"+\n") $(VERSIONOBJ:+"+\n") $(SHL$(TNR)OBJS:+"+\n")), \ $(STDSLO:+"+\n") $(SHL$(TNR)VERSIONOBJ:+"+\n") $(SHL$(TNR)OBJS:+"+\n")), \
$(@), \ $(@), \
$(MISC)$/$(@:b).map, \ $(MISC)$/$(@:b).map, \
@$(mktmp $(SHL$(TNR)LIBS:+"+\n") $(SHL$(TNR)STDLIBS:+"+\n") $(STDSHL:+"+\n")), \ @$(mktmp $(SHL$(TNR)LIBS:+"+\n") $(SHL$(TNR)STDLIBS:+"+\n") $(STDSHL:+"+\n")), \
$(SHL$(TNR)DEF:+"\n") $(SHL$(TNR)DEF:+"\n")
.ELSE .ELSE
$(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL$(TNR)LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL$(TNR)STDLIBS:^"-l") $(SHL$(TNR)OBJS) $(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)DEF) $(LINK) -o $@ -Zdll -Zmap=$(MISC)$/$(@:b).map -L$(LB) $(SHL$(TNR)LIBS:^"-l") -Ln:\toolkit4\lib -Ln:\emx09d\lib\mt -Ln:\emx09d\lib -L$(SOLARLIBDIR) $(STDSLO) $(STDSHL:^"-l") $(SHL$(TNR)STDLIBS:^"-l") $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)DEF)
.ENDIF .ENDIF
.IF "$(SHL$(TNR)RES)" != "" .IF "$(SHL$(TNR)RES)" != ""
$(RCLINK) $(RCLINKFLAGS) $(SHL$(TNR)RES) $@ $(RCLINK) $(RCLINKFLAGS) $(SHL$(TNR)RES) $@
...@@ -276,9 +271,9 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -276,9 +271,9 @@ $(SHL$(TNR)TARGETN) : \
@+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD) @+if not exist $(FUNCORD) $(TOUCH) $(FUNCORD)
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
gcc -c -o$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
cl -c -Fo$(SLO)$/_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)DEFAULTRES)"!="" .IF "$(SHL$(TNR)DEFAULTRES)"!=""
...@@ -315,7 +310,7 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -315,7 +310,7 @@ $(SHL$(TNR)TARGETN) : \
-def:$(SHL$(TNR)DEF) \ -def:$(SHL$(TNR)DEF) \
$(USE_$(TNR)IMPLIB) \ $(USE_$(TNR)IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) \ $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) \
$(SHL$(TNR)LIBS) \ $(SHL$(TNR)LIBS) \
$(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -326,7 +321,7 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -326,7 +321,7 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF # "$(BOTH)"!="" .ENDIF # "$(BOTH)"!=""
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
$(STDOBJ) $(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) | tr -d \r\n > $(MISC)$/$(@:b).cmd
@+$(TYPE) $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd @+$(TYPE) $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d \r\n >> $(MISC)$/$(@:b).cmd
@+echo $(SHL$(TNR)STDLIBS) $(STDSHL) $(SHL$(TNR)RES) >> $(MISC)$/$(@:b).cmd @+echo $(SHL$(TNR)STDLIBS) $(STDSHL) $(SHL$(TNR)RES) >> $(MISC)$/$(@:b).cmd
$(MISC)$/$(@:b).cmd $(MISC)$/$(@:b).cmd
...@@ -340,7 +335,7 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -340,7 +335,7 @@ $(SHL$(TNR)TARGETN) : \
-def:$(SHL$(TNR)DEF) \ -def:$(SHL$(TNR)DEF) \
$(USE_$(TNR)IMPLIB) \ $(USE_$(TNR)IMPLIB) \
$(STDOBJ) \ $(STDOBJ) \
$(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) \ $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) \
$(SHL$(TNR)LIBS) \ $(SHL$(TNR)LIBS) \
$(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -354,7 +349,7 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -354,7 +349,7 @@ $(SHL$(TNR)TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL$(TNR)IMPLIB).exp \ $(LB)$/$(SHL$(TNR)IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL$(TNR)OBJS) $(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \ $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \
$(SHL$(TNR)LIBS) \ $(SHL$(TNR)LIBS) \
$(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -373,7 +368,7 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -373,7 +368,7 @@ $(SHL$(TNR)TARGETN) : \
-map:$(MISC)$/$(@:B).map \ -map:$(MISC)$/$(@:B).map \
$(LB)$/$(SHL$(TNR)IMPLIB).exp \ $(LB)$/$(SHL$(TNR)IMPLIB).exp \
$(STDOBJ) \ $(STDOBJ) \
$(SHL$(TNR)OBJS) $(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \ $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \
$(SHL$(TNR)LIBS) \ $(SHL$(TNR)LIBS) \
$(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDLIBS) \
$(STDSHL) \ $(STDSHL) \
...@@ -408,26 +403,26 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -408,26 +403,26 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(UPDATER)"=="YES" .IF "$(UPDATER)"=="YES"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ELSE .ELSE
$(CC) -c -KPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX" .IF "$(OS)"=="MACOSX"
$(CC) -c -dynamic -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
$(CC) -c -fPIC -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
.ENDIF .ENDIF
.IF "$(OS)"=="IRIX" .IF "$(OS)"=="IRIX"
$(CC) -o $(SLO)$/_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
@+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
@+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
.ENDIF # "$(OS)"=="IRIX" .ENDIF # "$(OS)"=="IRIX"
.ENDIF .ENDIF
@+-$(RM) $(MISC)$/$(@:b).cmd @+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \ @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
$(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \ $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@cat $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd
...@@ -450,7 +445,7 @@ $(SHL$(TNR)TARGETN) : \ ...@@ -450,7 +445,7 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF # "$(GUI)" == "UNX" .ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
@+-$(RM) $@ $@.xSYM @+-$(RM) $@ $@.xSYM
$(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL$(TNR)OBJS) `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ)) $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@) $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(foreach,i,$(shell $(UNIX2MACPATH) $(PRJ)$/$(ROUT)$/lib $(SOLARLIB:s/-L//)) -L"$i") $(shell $(UNIX2MACPATH) $(STDSLO) $(SHL$(TNR)OBJS) `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ)) $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) -o $(shell $(UNIX2MACPATH) $@)
.ENDIF # "$(GUI)"=="MAC" .ENDIF # "$(GUI)"=="MAC"
.ENDIF # "$(SHL$(TNR)TARGETN)"!="" .ENDIF # "$(SHL$(TNR)TARGETN)"!=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment