From ae0228cdb340de85f42c25024986ce0e557503a3 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 7 Sep 2009 13:35:07 +0000 Subject: CWS-TOOLING: integrate CWS kick4nt --- solenv/inc/_tg_shl.mk | 1940 ++++++++++++++++++++++++------------------------- 1 file changed, 930 insertions(+), 1010 deletions(-) (limited to 'solenv/inc/_tg_shl.mk') diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 213cdbcbe414..0c881e1c3eca 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -29,7 +29,7 @@ LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH)) .IF "$(SHL1USE_EXPORTS)"=="" -SHL1DEF*=$(MISC)$/$(SHL1TARGET).def +SHL1DEF*=$(MISC)/$(SHL1TARGET).def .ENDIF # "$(SHL1USE_EXPORTS)"=="" EXTRALIBPATHS1=$(EXTRALIBPATHS) @@ -46,15 +46,15 @@ EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL1VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL1VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@ .INIT : $(SHL1VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -65,13 +65,13 @@ $(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VE SHL1IMPLIB=i$(TARGET)_t1 .ENDIF # "$(SHL1IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_1IMPLIB=-implib:$(LB)$/$(SHL1IMPLIB).lib +USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL1IMPLIBN=$(LB)$/$(SHL1IMPLIB).lib +SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib ALLTAR : $(SHL1IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_1IMPLIB_DEPS=$(LB)$/$(SHL1IMPLIB).lib +USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL1DEF=$(SHL1DEF) @@ -81,7 +81,7 @@ SHL1DEPN+:=$(SHL1DEPNU) .IF "$(SHL1VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap .ENDIF # "$(SHL1VERSIONMAP)"=="" .IF "$(USE_SHL1VERSIONMAP)"!="" @@ -89,7 +89,7 @@ USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap .IF "$(SHL1FILTERFILE)"!="" .IF "$(SHL1VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap $(USE_SHL1VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -116,10 +116,10 @@ $(USE_SHL1VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL1OBJS)!"="" @$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@ .ELSE # "$(SHL1FILTERFILE)"!="" -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap $(USE_SHL1VERSIONMAP) : @echo ----------------------------- @echo SHL1FILTERFILE not set! @@ -132,7 +132,7 @@ $(USE_SHL1VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL1VERSIONMAP)"!="" -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e) +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) .ENDIF @@ -152,7 +152,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -162,15 +162,15 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL1OBJS)"!="" - -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL1LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -194,15 +194,15 @@ SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\" .IF "$(SHL1RES)"!="" SHL1ALLRES+=$(SHL1RES) -SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res -SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o +SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1RES)"!="" .IF "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" -SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.res +SHL1DEFAULTRES*=$(MISC)/$(SHL1TARGET)_def.res SHL1ALLRES+=$(SHL1DEFAULTRES) -SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res -SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o +SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL1TARGETN)"!="" @@ -210,13 +210,13 @@ SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL1LIBS)"!="" -$(MISC)$/$(SHL1TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL1LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL1TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls $(SHL1TARGETN) : $(LINKINCTARGETS) .ELSE @@ -224,17 +224,17 @@ $(SHL1TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL1LIBS)"!="" -SHL1LINKLIST=$(MISC)$/$(SHL1TARGET)_link.lst +SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst SHL1LINKLISTPARAM=@$(SHL1LINKLIST) $(SHL1LINKLIST) : $(SHL1LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL1LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL1USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -245,7 +245,7 @@ SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL1STDLIBS:^"$(LB)$/") +_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i)) .ELSE SHL1IMP_ORD = @@ -266,54 +266,50 @@ $(SHL1TARGETN) : \ @echo Making: $(SHL1TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL1DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc .IF "$(SHL1ICON)" != "" - @echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL1ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ELSE # "$(SHL1ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1DEFAULTRES)"!="" .IF "$(SHL1ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES) .IF "$(COM)"=="GCC" windres $(SHL1LINKRES) $(SHL1LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL1DEF) \ --dllname $(SHL1TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_1.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd .IF "$(DEFLIB1NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_1.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_1.cmd .ELSE # "$(DEFLIB1NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ - `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_1.cmd + `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_1.cmd .ENDIF # "$(DEFLIB1NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ - `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \ - $(SHL1STDSHL) $(STDSHL1) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + $(SHL1STDSHL) $(STDSHL1) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL1USE_EXPORTS)"!="name" @@ -323,7 +319,7 @@ $(SHL1TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL1STACK) $(SHL1BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL1DEF) \ $(USE_1IMPLIB) \ $(STDOBJ) \ @@ -337,7 +333,7 @@ $(SHL1TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -348,8 +344,8 @@ $(SHL1TARGETN) : \ $(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ $(SHL1STACK) -out:$(SHL1TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL1IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL1IMPLIB).exp \ $(STDOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ) \ $(SHL1LIBS) \ @@ -361,7 +357,7 @@ $(SHL1TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -373,7 +369,7 @@ $(SHL1TARGETN) : \ $(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ $(SHL1STACK) -out:$(SHL1TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_1IMPLIB) \ $(STDOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ)) \ @@ -384,7 +380,7 @@ $(SHL1TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -393,25 +389,25 @@ $(SHL1TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL1USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL1TARGET).lnk - -$(RM) $(MISC)$/$(SHL1TARGET).lst + -$(RM) del $(MISC)/$(SHL1TARGET).lnk + -$(RM) $(MISC)/$(SHL1TARGET).lst $(TYPE) $(mktmp \ $(SHL1LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ $(SHL1STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL1IMPLIB).exp \ + $(LB)/$(SHL1IMPLIB).exp \ $(STDOBJ) \ $(SHL1OBJS) \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ - ) >> $(MISC)$/$(SHL1TARGET).lnk - $(TYPE) $(MISC)$/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL1TARGET).lnk - $(SHL1LINKER) @$(MISC)$/$(SHL1TARGET).lnk + ) >> $(MISC)/$(SHL1TARGET).lnk + $(TYPE) $(MISC)/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL1TARGET).lnk + $(SHL1LINKER) @$(MISC)/$(SHL1TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -423,45 +419,45 @@ $(SHL1TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ $(SHL1VERSIONOBJ) \ - `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_1.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @cat $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL1RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) .ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd + @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ $(SHL1VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd + @cat $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) .ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL1TARGETN:b) + $(RM) $(LB)/$(SHL1TARGETN:b) cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -470,27 +466,23 @@ $(SHL1TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL1DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL1ICON)" != "" - @-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL1ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL1DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL1DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1DEFAULTRES)"!="" .IF "$(SHL1ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -499,7 +491,7 @@ $(SHL1TARGETN) : \ $(SHL1DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL1OBJS) $(SHL1VERSIONOBJ) \ $(SHL1LIBS) \ $(SHL1STDLIBS:^"-l") \ @@ -514,7 +506,7 @@ $(SHL1TARGETN) : \ $(SHL1DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL1OBJS) $(SHL1VERSIONOBJ) \ $(SHL1LIBS) \ $(SHL1STDLIBS:^"-l") \ @@ -538,7 +530,7 @@ $(SHL1TARGETN) : \ ALLTAR : runtest_$(SHL1TARGET) runtest_$(SHL1TARGET) : $(SHL1TARGETN) - testshl $(SHL1TARGETN) sce$/$(SHL1TARGET).sce -msg -skip + testshl $(SHL1TARGETN) sce/$(SHL1TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL1TARGETN)"!="" @@ -574,7 +566,7 @@ LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH)) .IF "$(SHL2USE_EXPORTS)"=="" -SHL2DEF*=$(MISC)$/$(SHL2TARGET).def +SHL2DEF*=$(MISC)/$(SHL2TARGET).def .ENDIF # "$(SHL2USE_EXPORTS)"=="" EXTRALIBPATHS2=$(EXTRALIBPATHS) @@ -591,15 +583,15 @@ EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL2VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL2VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@ .INIT : $(SHL2VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -610,13 +602,13 @@ $(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VE SHL2IMPLIB=i$(TARGET)_t2 .ENDIF # "$(SHL2IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_2IMPLIB=-implib:$(LB)$/$(SHL2IMPLIB).lib +USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL2IMPLIBN=$(LB)$/$(SHL2IMPLIB).lib +SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib ALLTAR : $(SHL2IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_2IMPLIB_DEPS=$(LB)$/$(SHL2IMPLIB).lib +USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL2DEF=$(SHL2DEF) @@ -626,7 +618,7 @@ SHL2DEPN+:=$(SHL2DEPNU) .IF "$(SHL2VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap .ENDIF # "$(SHL2VERSIONMAP)"=="" .IF "$(USE_SHL2VERSIONMAP)"!="" @@ -634,7 +626,7 @@ USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap .IF "$(SHL2FILTERFILE)"!="" .IF "$(SHL2VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap $(USE_SHL2VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -661,10 +653,10 @@ $(USE_SHL2VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL2OBJS)!"="" @$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@ .ELSE # "$(SHL2FILTERFILE)"!="" -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap $(USE_SHL2VERSIONMAP) : @echo ----------------------------- @echo SHL2FILTERFILE not set! @@ -677,7 +669,7 @@ $(USE_SHL2VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL2VERSIONMAP)"!="" -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e) +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) .ENDIF @@ -697,7 +689,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -707,15 +699,15 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL2OBJS)"!="" - -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL2LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -739,15 +731,15 @@ SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\" .IF "$(SHL2RES)"!="" SHL2ALLRES+=$(SHL2RES) -SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res -SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o +SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2RES)"!="" .IF "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" -SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.res +SHL2DEFAULTRES*=$(MISC)/$(SHL2TARGET)_def.res SHL2ALLRES+=$(SHL2DEFAULTRES) -SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res -SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o +SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL2TARGETN)"!="" @@ -755,13 +747,13 @@ SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL2LIBS)"!="" -$(MISC)$/$(SHL2TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL2LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL2TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls $(SHL2TARGETN) : $(LINKINCTARGETS) .ELSE @@ -769,17 +761,17 @@ $(SHL2TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL2LIBS)"!="" -SHL2LINKLIST=$(MISC)$/$(SHL2TARGET)_link.lst +SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst SHL2LINKLISTPARAM=@$(SHL2LINKLIST) $(SHL2LINKLIST) : $(SHL2LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL2LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL2USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -790,7 +782,7 @@ SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL2STDLIBS:^"$(LB)$/") +_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i)) .ELSE SHL2IMP_ORD = @@ -811,54 +803,50 @@ $(SHL2TARGETN) : \ @echo Making: $(SHL2TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL2DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc .IF "$(SHL2ICON)" != "" - @echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL2ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ELSE # "$(SHL2ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2DEFAULTRES)"!="" .IF "$(SHL2ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES) .IF "$(COM)"=="GCC" windres $(SHL2LINKRES) $(SHL2LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL2DEF) \ --dllname $(SHL2TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_2.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd .IF "$(DEFLIB2NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_2.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_2.cmd .ELSE # "$(DEFLIB2NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ - `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_2.cmd + `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_2.cmd .ENDIF # "$(DEFLIB2NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ - `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \ - $(SHL2STDSHL) $(STDSHL2) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + $(SHL2STDSHL) $(STDSHL2) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL2USE_EXPORTS)"!="name" @@ -868,7 +856,7 @@ $(SHL2TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL2STACK) $(SHL2BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL2DEF) \ $(USE_2IMPLIB) \ $(STDOBJ) \ @@ -882,7 +870,7 @@ $(SHL2TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -893,8 +881,8 @@ $(SHL2TARGETN) : \ $(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ $(SHL2STACK) -out:$(SHL2TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL2IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL2IMPLIB).exp \ $(STDOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ) \ $(SHL2LIBS) \ @@ -906,7 +894,7 @@ $(SHL2TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -918,7 +906,7 @@ $(SHL2TARGETN) : \ $(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ $(SHL2STACK) -out:$(SHL2TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_2IMPLIB) \ $(STDOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ)) \ @@ -929,7 +917,7 @@ $(SHL2TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -938,25 +926,25 @@ $(SHL2TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL2USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL2TARGET).lnk - -$(RM) $(MISC)$/$(SHL2TARGET).lst + -$(RM) del $(MISC)/$(SHL2TARGET).lnk + -$(RM) $(MISC)/$(SHL2TARGET).lst $(TYPE) $(mktmp \ $(SHL2LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ $(SHL2STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL2IMPLIB).exp \ + $(LB)/$(SHL2IMPLIB).exp \ $(STDOBJ) \ $(SHL2OBJS) \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ - ) >> $(MISC)$/$(SHL2TARGET).lnk - $(TYPE) $(MISC)$/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL2TARGET).lnk - $(SHL2LINKER) @$(MISC)$/$(SHL2TARGET).lnk + ) >> $(MISC)/$(SHL2TARGET).lnk + $(TYPE) $(MISC)/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL2TARGET).lnk + $(SHL2LINKER) @$(MISC)/$(SHL2TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -968,45 +956,45 @@ $(SHL2TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ $(SHL2VERSIONOBJ) \ - `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_2.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @cat $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL2RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) .ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd + @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ $(SHL2VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd + @cat $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) .ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL2TARGETN:b) + $(RM) $(LB)/$(SHL2TARGETN:b) cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -1015,27 +1003,23 @@ $(SHL2TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL2DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL2ICON)" != "" - @-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL2ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL2DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL2DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2DEFAULTRES)"!="" .IF "$(SHL2ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -1044,7 +1028,7 @@ $(SHL2TARGETN) : \ $(SHL2DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL2OBJS) $(SHL2VERSIONOBJ) \ $(SHL2LIBS) \ $(SHL2STDLIBS:^"-l") \ @@ -1059,7 +1043,7 @@ $(SHL2TARGETN) : \ $(SHL2DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL2OBJS) $(SHL2VERSIONOBJ) \ $(SHL2LIBS) \ $(SHL2STDLIBS:^"-l") \ @@ -1083,7 +1067,7 @@ $(SHL2TARGETN) : \ ALLTAR : runtest_$(SHL2TARGET) runtest_$(SHL2TARGET) : $(SHL2TARGETN) - testshl $(SHL2TARGETN) sce$/$(SHL2TARGET).sce -msg -skip + testshl $(SHL2TARGETN) sce/$(SHL2TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL2TARGETN)"!="" @@ -1119,7 +1103,7 @@ LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH)) .IF "$(SHL3USE_EXPORTS)"=="" -SHL3DEF*=$(MISC)$/$(SHL3TARGET).def +SHL3DEF*=$(MISC)/$(SHL3TARGET).def .ENDIF # "$(SHL3USE_EXPORTS)"=="" EXTRALIBPATHS3=$(EXTRALIBPATHS) @@ -1136,15 +1120,15 @@ EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL3VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL3VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@ .INIT : $(SHL3VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -1155,13 +1139,13 @@ $(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VE SHL3IMPLIB=i$(TARGET)_t3 .ENDIF # "$(SHL3IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_3IMPLIB=-implib:$(LB)$/$(SHL3IMPLIB).lib +USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL3IMPLIBN=$(LB)$/$(SHL3IMPLIB).lib +SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib ALLTAR : $(SHL3IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_3IMPLIB_DEPS=$(LB)$/$(SHL3IMPLIB).lib +USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL3DEF=$(SHL3DEF) @@ -1171,7 +1155,7 @@ SHL3DEPN+:=$(SHL3DEPNU) .IF "$(SHL3VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap .ENDIF # "$(SHL3VERSIONMAP)"=="" .IF "$(USE_SHL3VERSIONMAP)"!="" @@ -1179,7 +1163,7 @@ USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap .IF "$(SHL3FILTERFILE)"!="" .IF "$(SHL3VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap $(USE_SHL3VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -1206,10 +1190,10 @@ $(USE_SHL3VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL3OBJS)!"="" @$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@ .ELSE # "$(SHL3FILTERFILE)"!="" -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap $(USE_SHL3VERSIONMAP) : @echo ----------------------------- @echo SHL3FILTERFILE not set! @@ -1222,7 +1206,7 @@ $(USE_SHL3VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL3VERSIONMAP)"!="" -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e) +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) .ENDIF @@ -1242,7 +1226,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -1252,15 +1236,15 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL3OBJS)"!="" - -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL3LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -1284,15 +1268,15 @@ SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\" .IF "$(SHL3RES)"!="" SHL3ALLRES+=$(SHL3RES) -SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res -SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o +SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3RES)"!="" .IF "$(SHL3DEFAULTRES)$(use_shl_versions)"!="" -SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.res +SHL3DEFAULTRES*=$(MISC)/$(SHL3TARGET)_def.res SHL3ALLRES+=$(SHL3DEFAULTRES) -SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res -SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o +SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL3TARGETN)"!="" @@ -1300,13 +1284,13 @@ SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL3LIBS)"!="" -$(MISC)$/$(SHL3TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL3LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL3TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls $(SHL3TARGETN) : $(LINKINCTARGETS) .ELSE @@ -1314,17 +1298,17 @@ $(SHL3TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL3LIBS)"!="" -SHL3LINKLIST=$(MISC)$/$(SHL3TARGET)_link.lst +SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst SHL3LINKLISTPARAM=@$(SHL3LINKLIST) $(SHL3LINKLIST) : $(SHL3LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL3LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL3USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -1335,7 +1319,7 @@ SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL3STDLIBS:^"$(LB)$/") +_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i)) .ELSE SHL3IMP_ORD = @@ -1356,54 +1340,50 @@ $(SHL3TARGETN) : \ @echo Making: $(SHL3TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL3DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc .IF "$(SHL3ICON)" != "" - @echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL3ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ELSE # "$(SHL3ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3DEFAULTRES)"!="" .IF "$(SHL3ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES) .IF "$(COM)"=="GCC" windres $(SHL3LINKRES) $(SHL3LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL3ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL3DEF) \ --dllname $(SHL3TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_3.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd .IF "$(DEFLIB3NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_3.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_3.cmd .ELSE # "$(DEFLIB3NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ - `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_3.cmd + `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_3.cmd .ENDIF # "$(DEFLIB3NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ - `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \ - $(SHL3STDSHL) $(STDSHL3) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + $(SHL3STDSHL) $(STDSHL3) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL3USE_EXPORTS)"!="name" @@ -1413,7 +1393,7 @@ $(SHL3TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL3STACK) $(SHL3BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL3DEF) \ $(USE_3IMPLIB) \ $(STDOBJ) \ @@ -1427,7 +1407,7 @@ $(SHL3TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1438,8 +1418,8 @@ $(SHL3TARGETN) : \ $(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ $(SHL3STACK) -out:$(SHL3TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL3IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL3IMPLIB).exp \ $(STDOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ) \ $(SHL3LIBS) \ @@ -1451,7 +1431,7 @@ $(SHL3TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1463,7 +1443,7 @@ $(SHL3TARGETN) : \ $(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ $(SHL3STACK) -out:$(SHL3TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_3IMPLIB) \ $(STDOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ)) \ @@ -1474,7 +1454,7 @@ $(SHL3TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1483,25 +1463,25 @@ $(SHL3TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL3USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL3TARGET).lnk - -$(RM) $(MISC)$/$(SHL3TARGET).lst + -$(RM) del $(MISC)/$(SHL3TARGET).lnk + -$(RM) $(MISC)/$(SHL3TARGET).lst $(TYPE) $(mktmp \ $(SHL3LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ $(SHL3STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL3IMPLIB).exp \ + $(LB)/$(SHL3IMPLIB).exp \ $(STDOBJ) \ $(SHL3OBJS) \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ - ) >> $(MISC)$/$(SHL3TARGET).lnk - $(TYPE) $(MISC)$/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL3TARGET).lnk - $(SHL3LINKER) @$(MISC)$/$(SHL3TARGET).lnk + ) >> $(MISC)/$(SHL3TARGET).lnk + $(TYPE) $(MISC)/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL3TARGET).lnk + $(SHL3LINKER) @$(MISC)/$(SHL3TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1513,45 +1493,45 @@ $(SHL3TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ $(SHL3VERSIONOBJ) \ - `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_3.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @cat $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL3RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) .ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd + @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ $(SHL3VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd + @cat $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) .ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL3TARGETN:b) + $(RM) $(LB)/$(SHL3TARGETN:b) cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -1560,27 +1540,23 @@ $(SHL3TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL3DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL3ICON)" != "" - @-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL3ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL3DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL3DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3DEFAULTRES)"!="" .IF "$(SHL3ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL3ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -1589,7 +1565,7 @@ $(SHL3TARGETN) : \ $(SHL3DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL3OBJS) $(SHL3VERSIONOBJ) \ $(SHL3LIBS) \ $(SHL3STDLIBS:^"-l") \ @@ -1604,7 +1580,7 @@ $(SHL3TARGETN) : \ $(SHL3DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL3OBJS) $(SHL3VERSIONOBJ) \ $(SHL3LIBS) \ $(SHL3STDLIBS:^"-l") \ @@ -1628,7 +1604,7 @@ $(SHL3TARGETN) : \ ALLTAR : runtest_$(SHL3TARGET) runtest_$(SHL3TARGET) : $(SHL3TARGETN) - testshl $(SHL3TARGETN) sce$/$(SHL3TARGET).sce -msg -skip + testshl $(SHL3TARGETN) sce/$(SHL3TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL3TARGETN)"!="" @@ -1664,7 +1640,7 @@ LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH)) .IF "$(SHL4USE_EXPORTS)"=="" -SHL4DEF*=$(MISC)$/$(SHL4TARGET).def +SHL4DEF*=$(MISC)/$(SHL4TARGET).def .ENDIF # "$(SHL4USE_EXPORTS)"=="" EXTRALIBPATHS4=$(EXTRALIBPATHS) @@ -1681,15 +1657,15 @@ EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL4VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL4VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@ .INIT : $(SHL4VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -1700,13 +1676,13 @@ $(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VE SHL4IMPLIB=i$(TARGET)_t4 .ENDIF # "$(SHL4IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_4IMPLIB=-implib:$(LB)$/$(SHL4IMPLIB).lib +USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL4IMPLIBN=$(LB)$/$(SHL4IMPLIB).lib +SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib ALLTAR : $(SHL4IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_4IMPLIB_DEPS=$(LB)$/$(SHL4IMPLIB).lib +USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL4DEF=$(SHL4DEF) @@ -1716,7 +1692,7 @@ SHL4DEPN+:=$(SHL4DEPNU) .IF "$(SHL4VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap .ENDIF # "$(SHL4VERSIONMAP)"=="" .IF "$(USE_SHL4VERSIONMAP)"!="" @@ -1724,7 +1700,7 @@ USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap .IF "$(SHL4FILTERFILE)"!="" .IF "$(SHL4VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap $(USE_SHL4VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -1751,10 +1727,10 @@ $(USE_SHL4VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL4OBJS)!"="" @$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@ .ELSE # "$(SHL4FILTERFILE)"!="" -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap $(USE_SHL4VERSIONMAP) : @echo ----------------------------- @echo SHL4FILTERFILE not set! @@ -1767,7 +1743,7 @@ $(USE_SHL4VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL4VERSIONMAP)"!="" -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e) +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) .ENDIF @@ -1787,7 +1763,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -1797,15 +1773,15 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL4OBJS)"!="" - -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL4LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -1829,15 +1805,15 @@ SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\" .IF "$(SHL4RES)"!="" SHL4ALLRES+=$(SHL4RES) -SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res -SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o +SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4RES)"!="" .IF "$(SHL4DEFAULTRES)$(use_shl_versions)"!="" -SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.res +SHL4DEFAULTRES*=$(MISC)/$(SHL4TARGET)_def.res SHL4ALLRES+=$(SHL4DEFAULTRES) -SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res -SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o +SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL4TARGETN)"!="" @@ -1845,13 +1821,13 @@ SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL4LIBS)"!="" -$(MISC)$/$(SHL4TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL4LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL4TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls $(SHL4TARGETN) : $(LINKINCTARGETS) .ELSE @@ -1859,17 +1835,17 @@ $(SHL4TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL4LIBS)"!="" -SHL4LINKLIST=$(MISC)$/$(SHL4TARGET)_link.lst +SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst SHL4LINKLISTPARAM=@$(SHL4LINKLIST) $(SHL4LINKLIST) : $(SHL4LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL4LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL4USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -1880,7 +1856,7 @@ SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL4STDLIBS:^"$(LB)$/") +_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i)) .ELSE SHL4IMP_ORD = @@ -1901,54 +1877,50 @@ $(SHL4TARGETN) : \ @echo Making: $(SHL4TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL4DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc .IF "$(SHL4ICON)" != "" - @echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL4ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ELSE # "$(SHL4ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4DEFAULTRES)"!="" .IF "$(SHL4ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES) .IF "$(COM)"=="GCC" windres $(SHL4LINKRES) $(SHL4LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL4ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL4DEF) \ --dllname $(SHL4TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_4.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd .IF "$(DEFLIB4NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_4.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_4.cmd .ELSE # "$(DEFLIB4NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ - `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_4.cmd + `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_4.cmd .ENDIF # "$(DEFLIB4NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ - `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \ - $(SHL4STDSHL) $(STDSHL4) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + $(SHL4STDSHL) $(STDSHL4) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL4USE_EXPORTS)"!="name" @@ -1958,7 +1930,7 @@ $(SHL4TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL4STACK) $(SHL4BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL4DEF) \ $(USE_4IMPLIB) \ $(STDOBJ) \ @@ -1972,7 +1944,7 @@ $(SHL4TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1983,8 +1955,8 @@ $(SHL4TARGETN) : \ $(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ $(SHL4STACK) -out:$(SHL4TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL4IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL4IMPLIB).exp \ $(STDOBJ) \ $(SHL4OBJS) $(SHL4VERSIONOBJ) \ $(SHL4LIBS) \ @@ -1996,7 +1968,7 @@ $(SHL4TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2008,7 +1980,7 @@ $(SHL4TARGETN) : \ $(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ $(SHL4STACK) -out:$(SHL4TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_4IMPLIB) \ $(STDOBJ) \ $(SHL4OBJS) $(SHL4VERSIONOBJ)) \ @@ -2019,7 +1991,7 @@ $(SHL4TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2028,25 +2000,25 @@ $(SHL4TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL4USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL4TARGET).lnk - -$(RM) $(MISC)$/$(SHL4TARGET).lst + -$(RM) del $(MISC)/$(SHL4TARGET).lnk + -$(RM) $(MISC)/$(SHL4TARGET).lst $(TYPE) $(mktmp \ $(SHL4LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ $(SHL4STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL4IMPLIB).exp \ + $(LB)/$(SHL4IMPLIB).exp \ $(STDOBJ) \ $(SHL4OBJS) \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ - ) >> $(MISC)$/$(SHL4TARGET).lnk - $(TYPE) $(MISC)$/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL4TARGET).lnk - $(SHL4LINKER) @$(MISC)$/$(SHL4TARGET).lnk + ) >> $(MISC)/$(SHL4TARGET).lnk + $(TYPE) $(MISC)/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL4TARGET).lnk + $(SHL4LINKER) @$(MISC)/$(SHL4TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2058,45 +2030,45 @@ $(SHL4TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ $(SHL4VERSIONOBJ) \ - `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_4.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @cat $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL4RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) .ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd + @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ $(SHL4VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd + @cat $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) .ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL4TARGETN:b) + $(RM) $(LB)/$(SHL4TARGETN:b) cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -2105,27 +2077,23 @@ $(SHL4TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL4DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL4ICON)" != "" - @-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL4ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL4DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL4DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4DEFAULTRES)"!="" .IF "$(SHL4ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL4ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -2134,7 +2102,7 @@ $(SHL4TARGETN) : \ $(SHL4DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL4OBJS) $(SHL4VERSIONOBJ) \ $(SHL4LIBS) \ $(SHL4STDLIBS:^"-l") \ @@ -2149,7 +2117,7 @@ $(SHL4TARGETN) : \ $(SHL4DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL4OBJS) $(SHL4VERSIONOBJ) \ $(SHL4LIBS) \ $(SHL4STDLIBS:^"-l") \ @@ -2173,7 +2141,7 @@ $(SHL4TARGETN) : \ ALLTAR : runtest_$(SHL4TARGET) runtest_$(SHL4TARGET) : $(SHL4TARGETN) - testshl $(SHL4TARGETN) sce$/$(SHL4TARGET).sce -msg -skip + testshl $(SHL4TARGETN) sce/$(SHL4TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL4TARGETN)"!="" @@ -2209,7 +2177,7 @@ LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH)) .IF "$(SHL5USE_EXPORTS)"=="" -SHL5DEF*=$(MISC)$/$(SHL5TARGET).def +SHL5DEF*=$(MISC)/$(SHL5TARGET).def .ENDIF # "$(SHL5USE_EXPORTS)"=="" EXTRALIBPATHS5=$(EXTRALIBPATHS) @@ -2226,15 +2194,15 @@ EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL5VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL5VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@ .INIT : $(SHL5VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -2245,13 +2213,13 @@ $(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VE SHL5IMPLIB=i$(TARGET)_t5 .ENDIF # "$(SHL5IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_5IMPLIB=-implib:$(LB)$/$(SHL5IMPLIB).lib +USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL5IMPLIBN=$(LB)$/$(SHL5IMPLIB).lib +SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib ALLTAR : $(SHL5IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_5IMPLIB_DEPS=$(LB)$/$(SHL5IMPLIB).lib +USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL5DEF=$(SHL5DEF) @@ -2261,7 +2229,7 @@ SHL5DEPN+:=$(SHL5DEPNU) .IF "$(SHL5VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap .ENDIF # "$(SHL5VERSIONMAP)"=="" .IF "$(USE_SHL5VERSIONMAP)"!="" @@ -2269,7 +2237,7 @@ USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap .IF "$(SHL5FILTERFILE)"!="" .IF "$(SHL5VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap $(USE_SHL5VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -2296,10 +2264,10 @@ $(USE_SHL5VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL5OBJS)!"="" @$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@ .ELSE # "$(SHL5FILTERFILE)"!="" -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap $(USE_SHL5VERSIONMAP) : @echo ----------------------------- @echo SHL5FILTERFILE not set! @@ -2312,7 +2280,7 @@ $(USE_SHL5VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL5VERSIONMAP)"!="" -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e) +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) .ENDIF @@ -2332,7 +2300,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -2342,15 +2310,15 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL5OBJS)"!="" - -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL5LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -2374,15 +2342,15 @@ SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\" .IF "$(SHL5RES)"!="" SHL5ALLRES+=$(SHL5RES) -SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res -SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o +SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5RES)"!="" .IF "$(SHL5DEFAULTRES)$(use_shl_versions)"!="" -SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.res +SHL5DEFAULTRES*=$(MISC)/$(SHL5TARGET)_def.res SHL5ALLRES+=$(SHL5DEFAULTRES) -SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res -SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o +SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL5TARGETN)"!="" @@ -2390,13 +2358,13 @@ SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL5LIBS)"!="" -$(MISC)$/$(SHL5TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL5LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL5TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL5TARGETN:b)_linkinc.ls $(SHL5TARGETN) : $(LINKINCTARGETS) .ELSE @@ -2404,17 +2372,17 @@ $(SHL5TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL5LIBS)"!="" -SHL5LINKLIST=$(MISC)$/$(SHL5TARGET)_link.lst +SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst SHL5LINKLISTPARAM=@$(SHL5LINKLIST) $(SHL5LINKLIST) : $(SHL5LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL5LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL5USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -2425,7 +2393,7 @@ SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL5STDLIBS:^"$(LB)$/") +_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i)) .ELSE SHL5IMP_ORD = @@ -2446,54 +2414,50 @@ $(SHL5TARGETN) : \ @echo Making: $(SHL5TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL5DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc .IF "$(SHL5ICON)" != "" - @echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL5ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ELSE # "$(SHL5ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5DEFAULTRES)"!="" .IF "$(SHL5ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES) .IF "$(COM)"=="GCC" windres $(SHL5LINKRES) $(SHL5LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL5ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL5DEF) \ --dllname $(SHL5TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_5.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd .IF "$(DEFLIB5NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_5.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_5.cmd .ELSE # "$(DEFLIB5NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ - `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_5.cmd + `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_5.cmd .ENDIF # "$(DEFLIB5NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ - `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \ - $(SHL5STDSHL) $(STDSHL5) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + $(SHL5STDSHL) $(STDSHL5) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL5USE_EXPORTS)"!="name" @@ -2503,7 +2467,7 @@ $(SHL5TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL5STACK) $(SHL5BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL5DEF) \ $(USE_5IMPLIB) \ $(STDOBJ) \ @@ -2517,7 +2481,7 @@ $(SHL5TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2528,8 +2492,8 @@ $(SHL5TARGETN) : \ $(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ $(SHL5STACK) -out:$(SHL5TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL5IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL5IMPLIB).exp \ $(STDOBJ) \ $(SHL5OBJS) $(SHL5VERSIONOBJ) \ $(SHL5LIBS) \ @@ -2541,7 +2505,7 @@ $(SHL5TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2553,7 +2517,7 @@ $(SHL5TARGETN) : \ $(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ $(SHL5STACK) -out:$(SHL5TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_5IMPLIB) \ $(STDOBJ) \ $(SHL5OBJS) $(SHL5VERSIONOBJ)) \ @@ -2564,7 +2528,7 @@ $(SHL5TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2573,25 +2537,25 @@ $(SHL5TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL5USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL5TARGET).lnk - -$(RM) $(MISC)$/$(SHL5TARGET).lst + -$(RM) del $(MISC)/$(SHL5TARGET).lnk + -$(RM) $(MISC)/$(SHL5TARGET).lst $(TYPE) $(mktmp \ $(SHL5LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ $(SHL5STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL5IMPLIB).exp \ + $(LB)/$(SHL5IMPLIB).exp \ $(STDOBJ) \ $(SHL5OBJS) \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ - ) >> $(MISC)$/$(SHL5TARGET).lnk - $(TYPE) $(MISC)$/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL5TARGET).lnk - $(SHL5LINKER) @$(MISC)$/$(SHL5TARGET).lnk + ) >> $(MISC)/$(SHL5TARGET).lnk + $(TYPE) $(MISC)/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL5TARGET).lnk + $(SHL5LINKER) @$(MISC)/$(SHL5TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2603,45 +2567,45 @@ $(SHL5TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ $(SHL5VERSIONOBJ) \ - `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_5.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @cat $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL5RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) .ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd + @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ $(SHL5VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd + @cat $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) .ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL5TARGETN:b) + $(RM) $(LB)/$(SHL5TARGETN:b) cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -2650,27 +2614,23 @@ $(SHL5TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL5DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL5ICON)" != "" - @-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL5ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL5DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL5DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5DEFAULTRES)"!="" .IF "$(SHL5ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL5ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -2679,7 +2639,7 @@ $(SHL5TARGETN) : \ $(SHL5DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL5OBJS) $(SHL5VERSIONOBJ) \ $(SHL5LIBS) \ $(SHL5STDLIBS:^"-l") \ @@ -2694,7 +2654,7 @@ $(SHL5TARGETN) : \ $(SHL5DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL5OBJS) $(SHL5VERSIONOBJ) \ $(SHL5LIBS) \ $(SHL5STDLIBS:^"-l") \ @@ -2718,7 +2678,7 @@ $(SHL5TARGETN) : \ ALLTAR : runtest_$(SHL5TARGET) runtest_$(SHL5TARGET) : $(SHL5TARGETN) - testshl $(SHL5TARGETN) sce$/$(SHL5TARGET).sce -msg -skip + testshl $(SHL5TARGETN) sce/$(SHL5TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL5TARGETN)"!="" @@ -2754,7 +2714,7 @@ LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH)) .IF "$(SHL6USE_EXPORTS)"=="" -SHL6DEF*=$(MISC)$/$(SHL6TARGET).def +SHL6DEF*=$(MISC)/$(SHL6TARGET).def .ENDIF # "$(SHL6USE_EXPORTS)"=="" EXTRALIBPATHS6=$(EXTRALIBPATHS) @@ -2771,15 +2731,15 @@ EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL6VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL6VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@ .INIT : $(SHL6VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -2790,13 +2750,13 @@ $(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VE SHL6IMPLIB=i$(TARGET)_t6 .ENDIF # "$(SHL6IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_6IMPLIB=-implib:$(LB)$/$(SHL6IMPLIB).lib +USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL6IMPLIBN=$(LB)$/$(SHL6IMPLIB).lib +SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib ALLTAR : $(SHL6IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_6IMPLIB_DEPS=$(LB)$/$(SHL6IMPLIB).lib +USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL6DEF=$(SHL6DEF) @@ -2806,7 +2766,7 @@ SHL6DEPN+:=$(SHL6DEPNU) .IF "$(SHL6VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap .ENDIF # "$(SHL6VERSIONMAP)"=="" .IF "$(USE_SHL6VERSIONMAP)"!="" @@ -2814,7 +2774,7 @@ USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap .IF "$(SHL6FILTERFILE)"!="" .IF "$(SHL6VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap $(USE_SHL6VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -2841,10 +2801,10 @@ $(USE_SHL6VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL6OBJS)!"="" @$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@ .ELSE # "$(SHL6FILTERFILE)"!="" -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap $(USE_SHL6VERSIONMAP) : @echo ----------------------------- @echo SHL6FILTERFILE not set! @@ -2857,7 +2817,7 @@ $(USE_SHL6VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL6VERSIONMAP)"!="" -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e) +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) .ENDIF @@ -2877,7 +2837,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -2887,15 +2847,15 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL6OBJS)"!="" - -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL6LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -2919,15 +2879,15 @@ SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\" .IF "$(SHL6RES)"!="" SHL6ALLRES+=$(SHL6RES) -SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res -SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o +SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6RES)"!="" .IF "$(SHL6DEFAULTRES)$(use_shl_versions)"!="" -SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.res +SHL6DEFAULTRES*=$(MISC)/$(SHL6TARGET)_def.res SHL6ALLRES+=$(SHL6DEFAULTRES) -SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res -SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o +SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL6TARGETN)"!="" @@ -2935,13 +2895,13 @@ SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL6LIBS)"!="" -$(MISC)$/$(SHL6TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL6LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL6TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL6TARGETN:b)_linkinc.ls $(SHL6TARGETN) : $(LINKINCTARGETS) .ELSE @@ -2949,17 +2909,17 @@ $(SHL6TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL6LIBS)"!="" -SHL6LINKLIST=$(MISC)$/$(SHL6TARGET)_link.lst +SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst SHL6LINKLISTPARAM=@$(SHL6LINKLIST) $(SHL6LINKLIST) : $(SHL6LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL6LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL6USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -2970,7 +2930,7 @@ SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL6STDLIBS:^"$(LB)$/") +_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i)) .ELSE SHL6IMP_ORD = @@ -2991,54 +2951,50 @@ $(SHL6TARGETN) : \ @echo Making: $(SHL6TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL6DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc .IF "$(SHL6ICON)" != "" - @echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL6ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ELSE # "$(SHL6ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6DEFAULTRES)"!="" .IF "$(SHL6ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES) .IF "$(COM)"=="GCC" windres $(SHL6LINKRES) $(SHL6LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL6ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL6DEF) \ --dllname $(SHL6TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_6.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd .IF "$(DEFLIB6NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_6.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_6.cmd .ELSE # "$(DEFLIB6NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ - `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_6.cmd + `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_6.cmd .ENDIF # "$(DEFLIB6NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ - `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \ - $(SHL6STDSHL) $(STDSHL6) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + $(SHL6STDSHL) $(STDSHL6) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL6USE_EXPORTS)"!="name" @@ -3048,7 +3004,7 @@ $(SHL6TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL6STACK) $(SHL6BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL6DEF) \ $(USE_6IMPLIB) \ $(STDOBJ) \ @@ -3062,7 +3018,7 @@ $(SHL6TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3073,8 +3029,8 @@ $(SHL6TARGETN) : \ $(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ $(SHL6STACK) -out:$(SHL6TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL6IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL6IMPLIB).exp \ $(STDOBJ) \ $(SHL6OBJS) $(SHL6VERSIONOBJ) \ $(SHL6LIBS) \ @@ -3086,7 +3042,7 @@ $(SHL6TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3098,7 +3054,7 @@ $(SHL6TARGETN) : \ $(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ $(SHL6STACK) -out:$(SHL6TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_6IMPLIB) \ $(STDOBJ) \ $(SHL6OBJS) $(SHL6VERSIONOBJ)) \ @@ -3109,7 +3065,7 @@ $(SHL6TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3118,25 +3074,25 @@ $(SHL6TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL6USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL6TARGET).lnk - -$(RM) $(MISC)$/$(SHL6TARGET).lst + -$(RM) del $(MISC)/$(SHL6TARGET).lnk + -$(RM) $(MISC)/$(SHL6TARGET).lst $(TYPE) $(mktmp \ $(SHL6LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ $(SHL6STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL6IMPLIB).exp \ + $(LB)/$(SHL6IMPLIB).exp \ $(STDOBJ) \ $(SHL6OBJS) \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ - ) >> $(MISC)$/$(SHL6TARGET).lnk - $(TYPE) $(MISC)$/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL6TARGET).lnk - $(SHL6LINKER) @$(MISC)$/$(SHL6TARGET).lnk + ) >> $(MISC)/$(SHL6TARGET).lnk + $(TYPE) $(MISC)/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL6TARGET).lnk + $(SHL6LINKER) @$(MISC)/$(SHL6TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3148,45 +3104,45 @@ $(SHL6TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ $(SHL6VERSIONOBJ) \ - `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_6.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @cat $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL6RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) .ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd + @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ $(SHL6VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd + @cat $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) .ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL6TARGETN:b) + $(RM) $(LB)/$(SHL6TARGETN:b) cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -3195,27 +3151,23 @@ $(SHL6TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL6DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL6ICON)" != "" - @-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL6ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL6DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL6DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6DEFAULTRES)"!="" .IF "$(SHL6ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL6ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -3224,7 +3176,7 @@ $(SHL6TARGETN) : \ $(SHL6DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL6OBJS) $(SHL6VERSIONOBJ) \ $(SHL6LIBS) \ $(SHL6STDLIBS:^"-l") \ @@ -3239,7 +3191,7 @@ $(SHL6TARGETN) : \ $(SHL6DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL6OBJS) $(SHL6VERSIONOBJ) \ $(SHL6LIBS) \ $(SHL6STDLIBS:^"-l") \ @@ -3263,7 +3215,7 @@ $(SHL6TARGETN) : \ ALLTAR : runtest_$(SHL6TARGET) runtest_$(SHL6TARGET) : $(SHL6TARGETN) - testshl $(SHL6TARGETN) sce$/$(SHL6TARGET).sce -msg -skip + testshl $(SHL6TARGETN) sce/$(SHL6TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL6TARGETN)"!="" @@ -3299,7 +3251,7 @@ LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH)) .IF "$(SHL7USE_EXPORTS)"=="" -SHL7DEF*=$(MISC)$/$(SHL7TARGET).def +SHL7DEF*=$(MISC)/$(SHL7TARGET).def .ENDIF # "$(SHL7USE_EXPORTS)"=="" EXTRALIBPATHS7=$(EXTRALIBPATHS) @@ -3316,15 +3268,15 @@ EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL7VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL7VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@ .INIT : $(SHL7VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -3335,13 +3287,13 @@ $(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VE SHL7IMPLIB=i$(TARGET)_t7 .ENDIF # "$(SHL7IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_7IMPLIB=-implib:$(LB)$/$(SHL7IMPLIB).lib +USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL7IMPLIBN=$(LB)$/$(SHL7IMPLIB).lib +SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib ALLTAR : $(SHL7IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_7IMPLIB_DEPS=$(LB)$/$(SHL7IMPLIB).lib +USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL7DEF=$(SHL7DEF) @@ -3351,7 +3303,7 @@ SHL7DEPN+:=$(SHL7DEPNU) .IF "$(SHL7VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap .ENDIF # "$(SHL7VERSIONMAP)"=="" .IF "$(USE_SHL7VERSIONMAP)"!="" @@ -3359,7 +3311,7 @@ USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap .IF "$(SHL7FILTERFILE)"!="" .IF "$(SHL7VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap $(USE_SHL7VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -3386,10 +3338,10 @@ $(USE_SHL7VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL7OBJS)!"="" @$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@ .ELSE # "$(SHL7FILTERFILE)"!="" -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap $(USE_SHL7VERSIONMAP) : @echo ----------------------------- @echo SHL7FILTERFILE not set! @@ -3402,7 +3354,7 @@ $(USE_SHL7VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL7VERSIONMAP)"!="" -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e) +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) .ENDIF @@ -3422,7 +3374,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -3432,15 +3384,15 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL7OBJS)"!="" - -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL7LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -3464,15 +3416,15 @@ SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\" .IF "$(SHL7RES)"!="" SHL7ALLRES+=$(SHL7RES) -SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res -SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o +SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7RES)"!="" .IF "$(SHL7DEFAULTRES)$(use_shl_versions)"!="" -SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.res +SHL7DEFAULTRES*=$(MISC)/$(SHL7TARGET)_def.res SHL7ALLRES+=$(SHL7DEFAULTRES) -SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res -SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o +SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL7TARGETN)"!="" @@ -3480,13 +3432,13 @@ SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL7LIBS)"!="" -$(MISC)$/$(SHL7TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL7LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL7TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL7TARGETN:b)_linkinc.ls $(SHL7TARGETN) : $(LINKINCTARGETS) .ELSE @@ -3494,17 +3446,17 @@ $(SHL7TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL7LIBS)"!="" -SHL7LINKLIST=$(MISC)$/$(SHL7TARGET)_link.lst +SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst SHL7LINKLISTPARAM=@$(SHL7LINKLIST) $(SHL7LINKLIST) : $(SHL7LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL7LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL7USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -3515,7 +3467,7 @@ SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL7STDLIBS:^"$(LB)$/") +_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i)) .ELSE SHL7IMP_ORD = @@ -3536,54 +3488,50 @@ $(SHL7TARGETN) : \ @echo Making: $(SHL7TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL7DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc .IF "$(SHL7ICON)" != "" - @echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL7ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ELSE # "$(SHL7ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7DEFAULTRES)"!="" .IF "$(SHL7ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES) .IF "$(COM)"=="GCC" windres $(SHL7LINKRES) $(SHL7LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL7ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL7DEF) \ --dllname $(SHL7TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_7.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd .IF "$(DEFLIB7NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_7.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_7.cmd .ELSE # "$(DEFLIB7NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ - `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_7.cmd + `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_7.cmd .ENDIF # "$(DEFLIB7NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ - `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \ - $(SHL7STDSHL) $(STDSHL7) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + $(SHL7STDSHL) $(STDSHL7) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL7USE_EXPORTS)"!="name" @@ -3593,7 +3541,7 @@ $(SHL7TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL7STACK) $(SHL7BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL7DEF) \ $(USE_7IMPLIB) \ $(STDOBJ) \ @@ -3607,7 +3555,7 @@ $(SHL7TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3618,8 +3566,8 @@ $(SHL7TARGETN) : \ $(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ $(SHL7STACK) -out:$(SHL7TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL7IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL7IMPLIB).exp \ $(STDOBJ) \ $(SHL7OBJS) $(SHL7VERSIONOBJ) \ $(SHL7LIBS) \ @@ -3631,7 +3579,7 @@ $(SHL7TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3643,7 +3591,7 @@ $(SHL7TARGETN) : \ $(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ $(SHL7STACK) -out:$(SHL7TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_7IMPLIB) \ $(STDOBJ) \ $(SHL7OBJS) $(SHL7VERSIONOBJ)) \ @@ -3654,7 +3602,7 @@ $(SHL7TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3663,25 +3611,25 @@ $(SHL7TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL7USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL7TARGET).lnk - -$(RM) $(MISC)$/$(SHL7TARGET).lst + -$(RM) del $(MISC)/$(SHL7TARGET).lnk + -$(RM) $(MISC)/$(SHL7TARGET).lst $(TYPE) $(mktmp \ $(SHL7LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ $(SHL7STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL7IMPLIB).exp \ + $(LB)/$(SHL7IMPLIB).exp \ $(STDOBJ) \ $(SHL7OBJS) \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ - ) >> $(MISC)$/$(SHL7TARGET).lnk - $(TYPE) $(MISC)$/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL7TARGET).lnk - $(SHL7LINKER) @$(MISC)$/$(SHL7TARGET).lnk + ) >> $(MISC)/$(SHL7TARGET).lnk + $(TYPE) $(MISC)/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL7TARGET).lnk + $(SHL7LINKER) @$(MISC)/$(SHL7TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3693,45 +3641,45 @@ $(SHL7TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ $(SHL7VERSIONOBJ) \ - `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_7.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @cat $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL7RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) .ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd + @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ $(SHL7VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd + @cat $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) .ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL7TARGETN:b) + $(RM) $(LB)/$(SHL7TARGETN:b) cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -3740,27 +3688,23 @@ $(SHL7TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL7DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL7ICON)" != "" - @-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL7ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL7DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL7DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7DEFAULTRES)"!="" .IF "$(SHL7ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL7ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -3769,7 +3713,7 @@ $(SHL7TARGETN) : \ $(SHL7DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL7OBJS) $(SHL7VERSIONOBJ) \ $(SHL7LIBS) \ $(SHL7STDLIBS:^"-l") \ @@ -3784,7 +3728,7 @@ $(SHL7TARGETN) : \ $(SHL7DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL7OBJS) $(SHL7VERSIONOBJ) \ $(SHL7LIBS) \ $(SHL7STDLIBS:^"-l") \ @@ -3808,7 +3752,7 @@ $(SHL7TARGETN) : \ ALLTAR : runtest_$(SHL7TARGET) runtest_$(SHL7TARGET) : $(SHL7TARGETN) - testshl $(SHL7TARGETN) sce$/$(SHL7TARGET).sce -msg -skip + testshl $(SHL7TARGETN) sce/$(SHL7TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL7TARGETN)"!="" @@ -3844,7 +3788,7 @@ LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH)) .IF "$(SHL8USE_EXPORTS)"=="" -SHL8DEF*=$(MISC)$/$(SHL8TARGET).def +SHL8DEF*=$(MISC)/$(SHL8TARGET).def .ENDIF # "$(SHL8USE_EXPORTS)"=="" EXTRALIBPATHS8=$(EXTRALIBPATHS) @@ -3861,15 +3805,15 @@ EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL8VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL8VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@ .INIT : $(SHL8VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -3880,13 +3824,13 @@ $(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VE SHL8IMPLIB=i$(TARGET)_t8 .ENDIF # "$(SHL8IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_8IMPLIB=-implib:$(LB)$/$(SHL8IMPLIB).lib +USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL8IMPLIBN=$(LB)$/$(SHL8IMPLIB).lib +SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib ALLTAR : $(SHL8IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_8IMPLIB_DEPS=$(LB)$/$(SHL8IMPLIB).lib +USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL8DEF=$(SHL8DEF) @@ -3896,7 +3840,7 @@ SHL8DEPN+:=$(SHL8DEPNU) .IF "$(SHL8VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap .ENDIF # "$(SHL8VERSIONMAP)"=="" .IF "$(USE_SHL8VERSIONMAP)"!="" @@ -3904,7 +3848,7 @@ USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap .IF "$(SHL8FILTERFILE)"!="" .IF "$(SHL8VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap $(USE_SHL8VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -3931,10 +3875,10 @@ $(USE_SHL8VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL8OBJS)!"="" @$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@ .ELSE # "$(SHL8FILTERFILE)"!="" -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap $(USE_SHL8VERSIONMAP) : @echo ----------------------------- @echo SHL8FILTERFILE not set! @@ -3947,7 +3891,7 @@ $(USE_SHL8VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL8VERSIONMAP)"!="" -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e) +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) .ENDIF @@ -3967,7 +3911,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -3977,15 +3921,15 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL8OBJS)"!="" - -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL8LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -4009,15 +3953,15 @@ SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\" .IF "$(SHL8RES)"!="" SHL8ALLRES+=$(SHL8RES) -SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res -SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o +SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8RES)"!="" .IF "$(SHL8DEFAULTRES)$(use_shl_versions)"!="" -SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.res +SHL8DEFAULTRES*=$(MISC)/$(SHL8TARGET)_def.res SHL8ALLRES+=$(SHL8DEFAULTRES) -SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res -SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o +SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL8TARGETN)"!="" @@ -4025,13 +3969,13 @@ SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL8LIBS)"!="" -$(MISC)$/$(SHL8TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL8LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL8TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL8TARGETN:b)_linkinc.ls $(SHL8TARGETN) : $(LINKINCTARGETS) .ELSE @@ -4039,17 +3983,17 @@ $(SHL8TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL8LIBS)"!="" -SHL8LINKLIST=$(MISC)$/$(SHL8TARGET)_link.lst +SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst SHL8LINKLISTPARAM=@$(SHL8LINKLIST) $(SHL8LINKLIST) : $(SHL8LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL8LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL8USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -4060,7 +4004,7 @@ SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL8STDLIBS:^"$(LB)$/") +_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i)) .ELSE SHL8IMP_ORD = @@ -4081,54 +4025,50 @@ $(SHL8TARGETN) : \ @echo Making: $(SHL8TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL8DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc .IF "$(SHL8ICON)" != "" - @echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL8ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ELSE # "$(SHL8ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8DEFAULTRES)"!="" .IF "$(SHL8ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES) .IF "$(COM)"=="GCC" windres $(SHL8LINKRES) $(SHL8LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL8ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL8DEF) \ --dllname $(SHL8TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_8.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd .IF "$(DEFLIB8NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_8.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_8.cmd .ELSE # "$(DEFLIB8NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ - `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_8.cmd + `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_8.cmd .ENDIF # "$(DEFLIB8NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ - `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \ - $(SHL8STDSHL) $(STDSHL8) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + $(SHL8STDSHL) $(STDSHL8) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL8USE_EXPORTS)"!="name" @@ -4138,7 +4078,7 @@ $(SHL8TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL8STACK) $(SHL8BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL8DEF) \ $(USE_8IMPLIB) \ $(STDOBJ) \ @@ -4152,7 +4092,7 @@ $(SHL8TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4163,8 +4103,8 @@ $(SHL8TARGETN) : \ $(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ $(SHL8STACK) -out:$(SHL8TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL8IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL8IMPLIB).exp \ $(STDOBJ) \ $(SHL8OBJS) $(SHL8VERSIONOBJ) \ $(SHL8LIBS) \ @@ -4176,7 +4116,7 @@ $(SHL8TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4188,7 +4128,7 @@ $(SHL8TARGETN) : \ $(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ $(SHL8STACK) -out:$(SHL8TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_8IMPLIB) \ $(STDOBJ) \ $(SHL8OBJS) $(SHL8VERSIONOBJ)) \ @@ -4199,7 +4139,7 @@ $(SHL8TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4208,25 +4148,25 @@ $(SHL8TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL8USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL8TARGET).lnk - -$(RM) $(MISC)$/$(SHL8TARGET).lst + -$(RM) del $(MISC)/$(SHL8TARGET).lnk + -$(RM) $(MISC)/$(SHL8TARGET).lst $(TYPE) $(mktmp \ $(SHL8LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ $(SHL8STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL8IMPLIB).exp \ + $(LB)/$(SHL8IMPLIB).exp \ $(STDOBJ) \ $(SHL8OBJS) \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ - ) >> $(MISC)$/$(SHL8TARGET).lnk - $(TYPE) $(MISC)$/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL8TARGET).lnk - $(SHL8LINKER) @$(MISC)$/$(SHL8TARGET).lnk + ) >> $(MISC)/$(SHL8TARGET).lnk + $(TYPE) $(MISC)/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL8TARGET).lnk + $(SHL8LINKER) @$(MISC)/$(SHL8TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4238,45 +4178,45 @@ $(SHL8TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ $(SHL8VERSIONOBJ) \ - `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_8.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @cat $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL8RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) .ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd + @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ $(SHL8VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd + @cat $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) .ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL8TARGETN:b) + $(RM) $(LB)/$(SHL8TARGETN:b) cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -4285,27 +4225,23 @@ $(SHL8TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL8DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL8ICON)" != "" - @-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL8ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL8DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL8DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8DEFAULTRES)"!="" .IF "$(SHL8ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL8ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -4314,7 +4250,7 @@ $(SHL8TARGETN) : \ $(SHL8DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL8OBJS) $(SHL8VERSIONOBJ) \ $(SHL8LIBS) \ $(SHL8STDLIBS:^"-l") \ @@ -4329,7 +4265,7 @@ $(SHL8TARGETN) : \ $(SHL8DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL8OBJS) $(SHL8VERSIONOBJ) \ $(SHL8LIBS) \ $(SHL8STDLIBS:^"-l") \ @@ -4353,7 +4289,7 @@ $(SHL8TARGETN) : \ ALLTAR : runtest_$(SHL8TARGET) runtest_$(SHL8TARGET) : $(SHL8TARGETN) - testshl $(SHL8TARGETN) sce$/$(SHL8TARGET).sce -msg -skip + testshl $(SHL8TARGETN) sce/$(SHL8TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL8TARGETN)"!="" @@ -4389,7 +4325,7 @@ LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH)) .IF "$(SHL9USE_EXPORTS)"=="" -SHL9DEF*=$(MISC)$/$(SHL9TARGET).def +SHL9DEF*=$(MISC)/$(SHL9TARGET).def .ENDIF # "$(SHL9USE_EXPORTS)"=="" EXTRALIBPATHS9=$(EXTRALIBPATHS) @@ -4406,15 +4342,15 @@ EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL9VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL9VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@ .INIT : $(SHL9VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -4425,13 +4361,13 @@ $(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VE SHL9IMPLIB=i$(TARGET)_t9 .ENDIF # "$(SHL9IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_9IMPLIB=-implib:$(LB)$/$(SHL9IMPLIB).lib +USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL9IMPLIBN=$(LB)$/$(SHL9IMPLIB).lib +SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib ALLTAR : $(SHL9IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_9IMPLIB_DEPS=$(LB)$/$(SHL9IMPLIB).lib +USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL9DEF=$(SHL9DEF) @@ -4441,7 +4377,7 @@ SHL9DEPN+:=$(SHL9DEPNU) .IF "$(SHL9VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap .ENDIF # "$(SHL9VERSIONMAP)"=="" .IF "$(USE_SHL9VERSIONMAP)"!="" @@ -4449,7 +4385,7 @@ USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap .IF "$(SHL9FILTERFILE)"!="" .IF "$(SHL9VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap $(USE_SHL9VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -4476,10 +4412,10 @@ $(USE_SHL9VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL9OBJS)!"="" @$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@ .ELSE # "$(SHL9FILTERFILE)"!="" -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap $(USE_SHL9VERSIONMAP) : @echo ----------------------------- @echo SHL9FILTERFILE not set! @@ -4492,7 +4428,7 @@ $(USE_SHL9VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL9VERSIONMAP)"!="" -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e) +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) .ENDIF @@ -4512,7 +4448,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -4522,15 +4458,15 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL9OBJS)"!="" - -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL9LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -4554,15 +4490,15 @@ SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\" .IF "$(SHL9RES)"!="" SHL9ALLRES+=$(SHL9RES) -SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res -SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o +SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9RES)"!="" .IF "$(SHL9DEFAULTRES)$(use_shl_versions)"!="" -SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.res +SHL9DEFAULTRES*=$(MISC)/$(SHL9TARGET)_def.res SHL9ALLRES+=$(SHL9DEFAULTRES) -SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res -SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o +SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL9TARGETN)"!="" @@ -4570,13 +4506,13 @@ SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL9LIBS)"!="" -$(MISC)$/$(SHL9TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL9LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL9TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL9TARGETN:b)_linkinc.ls $(SHL9TARGETN) : $(LINKINCTARGETS) .ELSE @@ -4584,17 +4520,17 @@ $(SHL9TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL9LIBS)"!="" -SHL9LINKLIST=$(MISC)$/$(SHL9TARGET)_link.lst +SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst SHL9LINKLISTPARAM=@$(SHL9LINKLIST) $(SHL9LINKLIST) : $(SHL9LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL9LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL9USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -4605,7 +4541,7 @@ SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL9STDLIBS:^"$(LB)$/") +_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i)) .ELSE SHL9IMP_ORD = @@ -4626,54 +4562,50 @@ $(SHL9TARGETN) : \ @echo Making: $(SHL9TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL9DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc .IF "$(SHL9ICON)" != "" - @echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL9ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ELSE # "$(SHL9ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9DEFAULTRES)"!="" .IF "$(SHL9ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES) .IF "$(COM)"=="GCC" windres $(SHL9LINKRES) $(SHL9LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL9ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL9DEF) \ --dllname $(SHL9TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_9.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd .IF "$(DEFLIB9NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_9.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_9.cmd .ELSE # "$(DEFLIB9NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ - `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_9.cmd + `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_9.cmd .ENDIF # "$(DEFLIB9NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ - `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \ - $(SHL9STDSHL) $(STDSHL9) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + $(SHL9STDSHL) $(STDSHL9) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL9USE_EXPORTS)"!="name" @@ -4683,7 +4615,7 @@ $(SHL9TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL9STACK) $(SHL9BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL9DEF) \ $(USE_9IMPLIB) \ $(STDOBJ) \ @@ -4697,7 +4629,7 @@ $(SHL9TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4708,8 +4640,8 @@ $(SHL9TARGETN) : \ $(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ $(SHL9STACK) -out:$(SHL9TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL9IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL9IMPLIB).exp \ $(STDOBJ) \ $(SHL9OBJS) $(SHL9VERSIONOBJ) \ $(SHL9LIBS) \ @@ -4721,7 +4653,7 @@ $(SHL9TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4733,7 +4665,7 @@ $(SHL9TARGETN) : \ $(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ $(SHL9STACK) -out:$(SHL9TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_9IMPLIB) \ $(STDOBJ) \ $(SHL9OBJS) $(SHL9VERSIONOBJ)) \ @@ -4744,7 +4676,7 @@ $(SHL9TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4753,25 +4685,25 @@ $(SHL9TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL9USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL9TARGET).lnk - -$(RM) $(MISC)$/$(SHL9TARGET).lst + -$(RM) del $(MISC)/$(SHL9TARGET).lnk + -$(RM) $(MISC)/$(SHL9TARGET).lst $(TYPE) $(mktmp \ $(SHL9LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ $(SHL9STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL9IMPLIB).exp \ + $(LB)/$(SHL9IMPLIB).exp \ $(STDOBJ) \ $(SHL9OBJS) \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ - ) >> $(MISC)$/$(SHL9TARGET).lnk - $(TYPE) $(MISC)$/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL9TARGET).lnk - $(SHL9LINKER) @$(MISC)$/$(SHL9TARGET).lnk + ) >> $(MISC)/$(SHL9TARGET).lnk + $(TYPE) $(MISC)/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL9TARGET).lnk + $(SHL9LINKER) @$(MISC)/$(SHL9TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4783,45 +4715,45 @@ $(SHL9TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ $(SHL9VERSIONOBJ) \ - `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_9.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @cat $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL9RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) .ENDIF # "$(SHL9NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd + @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ $(SHL9VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd + @cat $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) .ENDIF # "$(SHL9NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL9TARGETN:b) + $(RM) $(LB)/$(SHL9TARGETN:b) cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -4830,27 +4762,23 @@ $(SHL9TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL9DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL9ICON)" != "" - @-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL9ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL9DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL9DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9DEFAULTRES)"!="" .IF "$(SHL9ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL9ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -4859,7 +4787,7 @@ $(SHL9TARGETN) : \ $(SHL9DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL9OBJS) $(SHL9VERSIONOBJ) \ $(SHL9LIBS) \ $(SHL9STDLIBS:^"-l") \ @@ -4874,7 +4802,7 @@ $(SHL9TARGETN) : \ $(SHL9DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL9OBJS) $(SHL9VERSIONOBJ) \ $(SHL9LIBS) \ $(SHL9STDLIBS:^"-l") \ @@ -4898,7 +4826,7 @@ $(SHL9TARGETN) : \ ALLTAR : runtest_$(SHL9TARGET) runtest_$(SHL9TARGET) : $(SHL9TARGETN) - testshl $(SHL9TARGETN) sce$/$(SHL9TARGET).sce -msg -skip + testshl $(SHL9TARGETN) sce/$(SHL9TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL9TARGETN)"!="" @@ -4934,7 +4862,7 @@ LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH)) .IF "$(SHL10USE_EXPORTS)"=="" -SHL10DEF*=$(MISC)$/$(SHL10TARGET).def +SHL10DEF*=$(MISC)/$(SHL10TARGET).def .ENDIF # "$(SHL10USE_EXPORTS)"=="" EXTRALIBPATHS10=$(EXTRALIBPATHS) @@ -4951,15 +4879,15 @@ EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH) .IF "$(VERSIONOBJ)"!="" SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL10VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL10VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@ .INIT : $(SHL10VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" @@ -4970,13 +4898,13 @@ $(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10 SHL10IMPLIB=i$(TARGET)_t10 .ENDIF # "$(SHL10IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_10IMPLIB=-implib:$(LB)$/$(SHL10IMPLIB).lib +USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL10IMPLIBN=$(LB)$/$(SHL10IMPLIB).lib +SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib ALLTAR : $(SHL10IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_10IMPLIB_DEPS=$(LB)$/$(SHL10IMPLIB).lib +USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL10DEF=$(SHL10DEF) @@ -4986,7 +4914,7 @@ SHL10DEPN+:=$(SHL10DEPNU) .IF "$(SHL10VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap .ENDIF # "$(SHL10VERSIONMAP)"=="" .IF "$(USE_SHL10VERSIONMAP)"!="" @@ -4994,7 +4922,7 @@ USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap .IF "$(SHL10FILTERFILE)"!="" .IF "$(SHL10VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap $(USE_SHL10VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -5021,10 +4949,10 @@ $(USE_SHL10VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL10OBJS)!"="" @$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@ .ELSE # "$(SHL10FILTERFILE)"!="" -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap $(USE_SHL10VERSIONMAP) : @echo ----------------------------- @echo SHL10FILTERFILE not set! @@ -5037,7 +4965,7 @@ $(USE_SHL10VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL10VERSIONMAP)"!="" -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e) +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) .ENDIF @@ -5057,7 +4985,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -5067,15 +4995,15 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL10OBJS)"!="" - -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL10LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -5099,15 +5027,15 @@ SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\" .IF "$(SHL10RES)"!="" SHL10ALLRES+=$(SHL10RES) -SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res -SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o +SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10RES)"!="" .IF "$(SHL10DEFAULTRES)$(use_shl_versions)"!="" -SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.res +SHL10DEFAULTRES*=$(MISC)/$(SHL10TARGET)_def.res SHL10ALLRES+=$(SHL10DEFAULTRES) -SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res -SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o +SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL10TARGETN)"!="" @@ -5115,13 +5043,13 @@ SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL10LIBS)"!="" -$(MISC)$/$(SHL10TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL10LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL10TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL10TARGETN:b)_linkinc.ls $(SHL10TARGETN) : $(LINKINCTARGETS) .ELSE @@ -5129,17 +5057,17 @@ $(SHL10TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL10LIBS)"!="" -SHL10LINKLIST=$(MISC)$/$(SHL10TARGET)_link.lst +SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst SHL10LINKLISTPARAM=@$(SHL10LINKLIST) $(SHL10LINKLIST) : $(SHL10LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL10LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL10USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -5150,7 +5078,7 @@ SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL10STDLIBS:^"$(LB)$/") +_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i)) .ELSE SHL10IMP_ORD = @@ -5171,54 +5099,50 @@ $(SHL10TARGETN) : \ @echo Making: $(SHL10TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL10DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc .IF "$(SHL10ICON)" != "" - @echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL10ADD_VERINFO)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ELSE # "$(SHL10ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10DEFAULTRES)"!="" .IF "$(SHL10ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES) .IF "$(COM)"=="GCC" windres $(SHL10LINKRES) $(SHL10LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL10ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL10DEF) \ --dllname $(SHL10TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_10.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd .IF "$(DEFLIB10NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_10.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o >> $(MISC)/$(TARGET).$(@:b)_10.cmd .ELSE # "$(DEFLIB10NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)/$(@:b)_exp.o \ $(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ - `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_10.cmd + `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` >> $(MISC)/$(TARGET).$(@:b)_10.cmd .ENDIF # "$(DEFLIB10NAME)"!="" @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ - `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \ - $(SHL10STDSHL) $(STDSHL10) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + $(SHL10STDSHL) $(STDSHL10) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL10USE_EXPORTS)"!="name" @@ -5228,7 +5152,7 @@ $(SHL10TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL10STACK) $(SHL10BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL10DEF) \ $(USE_10IMPLIB) \ $(STDOBJ) \ @@ -5242,7 +5166,7 @@ $(SHL10TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5253,8 +5177,8 @@ $(SHL10TARGETN) : \ $(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ $(SHL10STACK) -out:$(SHL10TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL10IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL10IMPLIB).exp \ $(STDOBJ) \ $(SHL10OBJS) $(SHL10VERSIONOBJ) \ $(SHL10LIBS) \ @@ -5266,7 +5190,7 @@ $(SHL10TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5278,7 +5202,7 @@ $(SHL10TARGETN) : \ $(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ $(SHL10STACK) -out:$(SHL10TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_10IMPLIB) \ $(STDOBJ) \ $(SHL10OBJS) $(SHL10VERSIONOBJ)) \ @@ -5289,7 +5213,7 @@ $(SHL10TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5298,25 +5222,25 @@ $(SHL10TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL10USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL10TARGET).lnk - -$(RM) $(MISC)$/$(SHL10TARGET).lst + -$(RM) del $(MISC)/$(SHL10TARGET).lnk + -$(RM) $(MISC)/$(SHL10TARGET).lst $(TYPE) $(mktmp \ $(SHL10LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ $(SHL10STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL10IMPLIB).exp \ + $(LB)/$(SHL10IMPLIB).exp \ $(STDOBJ) \ $(SHL10OBJS) \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ - ) >> $(MISC)$/$(SHL10TARGET).lnk - $(TYPE) $(MISC)$/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL10TARGET).lnk - $(SHL10LINKER) @$(MISC)$/$(SHL10TARGET).lnk + ) >> $(MISC)/$(SHL10TARGET).lnk + $(TYPE) $(MISC)/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL10TARGET).lnk + $(SHL10LINKER) @$(MISC)/$(SHL10TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5328,45 +5252,45 @@ $(SHL10TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ $(SHL10VERSIONOBJ) \ - `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_10.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @cat $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL10RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) .ENDIF # "$(SHL10NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd + @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ $(SHL10VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd + @cat $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) .ENDIF # "$(SHL10NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL10TARGETN:b) + $(RM) $(LB)/$(SHL10TARGETN:b) cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -5375,27 +5299,23 @@ $(SHL10TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL10DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL10ICON)" != "" - @-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @-+echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF .IF "$(use_shl_versions)" != "" .IF "$(SHL10ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)$/$(SHL10DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL10DEFAULTRES:b).rc +# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10DEFAULTRES)"!="" .IF "$(SHL10ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL10ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -5404,7 +5324,7 @@ $(SHL10TARGETN) : \ $(SHL10DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL10OBJS) $(SHL10VERSIONOBJ) \ $(SHL10LIBS) \ $(SHL10STDLIBS:^"-l") \ @@ -5419,7 +5339,7 @@ $(SHL10TARGETN) : \ $(SHL10DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL10OBJS) $(SHL10VERSIONOBJ) \ $(SHL10LIBS) \ $(SHL10STDLIBS:^"-l") \ @@ -5443,7 +5363,7 @@ $(SHL10TARGETN) : \ ALLTAR : runtest_$(SHL10TARGET) runtest_$(SHL10TARGET) : $(SHL10TARGETN) - testshl $(SHL10TARGETN) sce$/$(SHL10TARGET).sce -msg -skip + testshl $(SHL10TARGETN) sce/$(SHL10TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL10TARGETN)"!="" -- cgit