strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preparing versions in library names

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2001-04-26 10:18:43 +00:00
parent e35d6080b7
commit cfd15db976
4 changed files with 642 additions and 463 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1052
solenv/inc/_tg_shl.mk
View file

File diff suppressed because it is too large Load diff

12
solenv/inc/pstrules.mk
View file

@ -8,8 +8,8 @@
#* in makefile.mk
#*
#* Ersterstellung HJS 20.07.99
#* Letzte Aenderung $Author: hjs $ $Date: 2001-02-02 12:01:50 $
#* $Revision: 1.3 $
#* Letzte Aenderung $Author: hjs $ $Date: 2001-04-26 11:18:43 $
#* $Revision: 1.4 $
#*
#* $Logfile: T:/solar/inc/pstrules.mkv $
#*
@ -198,16 +198,16 @@ $(PAR)$/%.par :
@echo Making: $@
@+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
.IF "$(GUI)"=="OS2"
$(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
$(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="WNT"
$(CC) /EP $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
$(CC) /EP $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="SOLARIS"
cpp.lcc -+ -P -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
cpp.lcc -+ -P -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ELSE
$(CC) -E -P -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -x c++ $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
$(CC) -E -P -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -x c++ $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
.ENDIF
.ENDIF
+scpcomp -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@

20
solenv/inc/tg_shl.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: tg_shl.mk,v $
#
# $Revision: 1.29 $
# $Revision: 1.30 $
#
# last change: $Author: pluby $ $Date: 2001-03-06 19:20:33 $
# last change: $Author: hjs $ $Date: 2001-04-26 11:18:43 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -209,6 +209,14 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
.ENDIF # "$(USE_SHL$(TNR)VERSIONMAP)"!=""
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
SHL$(TNR)SONAME)=$(SONAME_SWITCH) $(SHL$(TNR)TARGETN:b:b)
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
.IF "$(NO_REC_RES)"!=""
.IF "$(SHL$(TNR)RES)"!=""
SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES))
@ -460,7 +468,7 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF
.ELSE # "$(OS)"=="MACOSX"
@+-$(RM) $(MISC)$/$(@:b).cmd
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
@+echo $(LINK) $(LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
`cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
@ -473,6 +481,12 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(UPDATER)"=="YES"
+$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL$(TNR)TARGETN)
.ENDIF # "$(UPDATER)"=="YES"
.IF "$(UNIXVERSIONNAMES)"!=""
+$(RM) $(LB)$/$(SHL$(TNR)TARGETN:b:b:b)
+$(RM) $(LB)$/$(SHL$(TNR)TARGETN:b:b)
+$(COPY) $(SHL$(TNR)TARGETN) $(LB)$/$(SHL$(TNR)TARGETN:b:b)
+$(COPY) $(LB)$/$(SHL$(TNR)TARGETN:f:b:b) $(LB)$/$(SHL$(TNR)TARGETN:b:b:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF # "$(GUI)" == "UNX"
.IF "$(GUI)"=="MAC"

21
solenv/inc/unx.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: unx.mk,v $
#
# $Revision: 1.7 $
# $Revision: 1.8 $
#
# last change: $Author: hr $ $Date: 2000-11-23 17:24:26 $
# last change: $Author: hjs $ $Date: 2001-04-26 11:18:43 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -181,4 +181,19 @@ YACCFLAGS*=-d -t
EXECPOST=
SCPPOST=.ins
DLLDEST=$(LB)
.ENDIF
SONAME_SWITCH*=-h
.IF "$(UNIXVERSIONNAMES)"!=""
DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR).$($(UNIXVERSIONNAMES)_MINOR).$($(UNIXVERSIONNAMES)_MICRO)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
.IF "$(UDK_MAJOR)"!=""
SCPDEFS+=-D$(UDK_MAJOR)
.ENDIF # "$(UDK_MAJOR)"!=""
.IF "$(UDK_MINOR)"!=""
SCPDEFS+=-D$(UDK_MINOR)
.ENDIF # "$(UDK_MINOR)"!=""
.IF "$(UDK_MICRO)"!=""
SCPDEFS+=-D$(UDK_MICRO)
.ENDIF # "$(UDK_MICRO)"!=""
.ENDIF # "$(GUI)" == "UNX"