mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS tune01 (1.24.2.3.2.2.6); FILE MERGED

Browse Source 
2003/04/11 13:38:34 mhu 1.24.2.3.2.2.6.3: #104380# Fixed systoolsunx merge mistake.
2003/04/07 22:15:15 mhu 1.24.2.3.2.2.6.2: RESYNC: (1.24.2.3.2.2-1.29); FILE MERGED
2003/04/06 14:49:54 mhu 1.24.2.3.2.2.6.1: #104380# For Solaris (-Bdirect) explicitly specify -Bdynamic for imported system libraries. Cleaned up much obsolete stuff.
This commit is contained in:
Vladimir Glazounov
2003-04-15 12:48:07 +00:00
parent 68ba715467
commit 5dfdfdb503
1 changed files with 37 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
sal/util/makefile.mk
View File

@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.29 $ # $Revision: 1.30 $
# #
# last change: $Author: hr $ $Date: 2003-03-26 16:47:20 $ # last change: $Author: vg $ $Date: 2003-04-15 13:48:07 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@@ -66,21 +66,21 @@ $(PRJPCH)=
PRJNAME=sal PRJNAME=sal
TARGET=sal TARGET=sal
NO_BSYMBOLIC=TRUE NO_BSYMBOLIC=TRUE
NO_DEFAULT_STL=TRUE NO_DEFAULT_STL=TRUE
USE_LDUMP2=TRUE
.IF "$(GUI)"!="OS2" USE_LDUMP2=TRUE
USE_DEFFILE=TRUE USE_DEFFILE=TRUE
.ENDIF
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
TARGETTYPE=CUI TARGETTYPE=CUI
.ENDIF .ENDIF # UNX
UNIXVERSIONNAMES=UDK UNIXVERSIONNAMES=UDK
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(depend)" == "" .IF "$(depend)" == ""
@@ -92,22 +92,31 @@ UNIXVERSIONNAMES=UDK
CHECKFORPIC= CHECKFORPIC=
.IF "$(header)" == "" .IF "$(header)" == ""
LIB1TARGET=$(SLB)$/$(TARGET).lib
LIB1FILES=$(SLB)$/cpposl.lib $(SLB)$/oslall.lib $(SLB)$/cpprtl.lib
.IF "$(GUI)"!="WIN" LIB1TARGET=$(SLB)$/$(TARGET).lib
LIB1FILES+=$(SLB)$/textenc.lib LIB1FILES= \
.ENDIF $(SLB)$/oslall.lib \
$(SLB)$/cpposl.lib \
$(SLB)$/cpprtl.lib \
$(SLB)$/textenc.lib
#.IF "$(GUI)"=="UNX"
#LIB1FILES+=$(SLB)$/systoolsunx.lib
#.ENDIF # UNX
LIB3TARGET=$(LB)$/a$(TARGET).lib LIB3TARGET=$(LB)$/a$(TARGET).lib
LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
LIB3FILES=$(LB)$/cpposl.lib $(LB)$/oslall.lib $(LB)$/cpprtl.lib LIB3FILES= \
$(LB)$/oslall.lib \
$(LB)$/cpposl.lib \
$(LB)$/cpprtl.lib \
$(LB)$/textenc.lib
#.IF "$(GUI)"=="UNX"
#LIB3FILES+=$(LB)$/systoolsunx.lib
#.ENDIF # UNX
#.IF "$(UPDATER)"!=""
.IF "$(GUI)"!="WIN"
LIB3FILES+=$(LB)$/textenc.lib
.ENDIF
#.ENDIF
SHL1TARGET= $(TARGET) SHL1TARGET= $(TARGET)
SHL1IMPLIB= i$(TARGET) SHL1IMPLIB= i$(TARGET)
@@ -127,39 +136,26 @@ SHL1STDLIBS= \
ole32.lib ole32.lib
.ELSE .ELSE
SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32 SHL1STDLIBS= -luwinapi.lib -ladvapi32 -lwsock32 -lmpr -lole32
.ENDIF .ENDIF # GCC
.ENDIF .ENDIF # WNT
.IF "$(GUI)"=="WIN"
SHL1STDLIBS= winsock.lib
.ENDIF
.IF "$(GUI)"=="MAC" .IF "$(GUI)"=="MAC"
SHL1STDLIBS=-L$(shell $(UNIX2MACPATH) $(MW_HOME)$/Metrowerks\ CodeWarrior$/MacOS\ Support$/OpenTransport$/Open\ Tpt\ Client\ Developer$/PPC\ Libraries) \ SHL1STDLIBS=-L$(shell $(UNIX2MACPATH) $(MW_HOME)$/Metrowerks\ CodeWarrior$/MacOS\ Support$/OpenTransport$/Open\ Tpt\ Client\ Developer$/PPC\ Libraries) \
-weakimport -lOpenTransportLib -weakimport -lOpenTptInternetLib \ -weakimport -lOpenTransportLib -weakimport -lOpenTptInternetLib \
-lOpenTransportExtnPPC.o -lOpenTptInetPPC.o -lOpenTransportExtnPPC.o -lOpenTptInetPPC.o
SHL1STDLIBS+=-init InitLibrary -term ExitLibrary SHL1STDLIBS+=-init InitLibrary -term ExitLibrary
.ENDIF .ENDIF # MAC
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
.IF "$(OS)"=="SOLARIS" .IF "$(OS)"=="SOLARIS"
# libposix4.so (SunOS 5.6) -> librt.so (SunOS >= 5.7) # libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
SHL1STDLIBS= -lnsl -lsocket -lpthread -lposix4 SHL1STDLIBS= -Bdynamic -ldl -lpthread -lposix4 -lsocket -lnsl
.IF "$(COM)" == "C50" .IF "$(COM)" == "C50"
SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
.ENDIF # C50 .ENDIF # C50
.ENDIF # SOLARIS .ENDIF # SOLARIS
.ENDIF # UNX .ENDIF # UNX
.IF "$(GUI)"=="OS2"
SHL1STDLIBS=n:\toolkit4\lib\so32dll.lib\
n:\toolkit4\lib\tcp32dll.lib\
os2286.lib
.ENDIF
SHL1LIBS+=$(SLB)$/$(TARGET).lib SHL1LIBS+=$(SLB)$/$(TARGET).lib
.IF "$(linkinc)" != "" .IF "$(linkinc)" != ""
@@ -174,60 +170,22 @@ SHL1OBJS= \
.ELSE .ELSE
SHL1OBJS= \ SHL1OBJS= \
$(SLO)$/dllentry.obj $(SLO)$/dllentry.obj
.ENDIF .ENDIF # MAC
.ENDIF .ENDIF # UNX
.ENDIF .ENDIF # lincinc
SHL1DEPN= SHL1DEPN=
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET) DEF1NAME= $(SHL1TARGET)
.IF "$(GUI)"=="OS2"
DEF1EXPORT1=SignalHandlerFunction
.ENDIF
# --- tec ---
#SALLIB= isal.lib
#.IF "$(GUI)"!="WIN"
#LIB2TARGET= $(SLB)$/tec.lib
#LIB2ARCHIV= $(LB)$/libtec$(UPD)$(DLLPOSTFIX).a
#LIB2FILES= $(SLB)$/textenc.lib
#.IF "$(UPDATER)"=="YES"
#LIB2TARGET= $(LB)$/atec.lib
#LIB2ARCHIV= $(LB)$/libtec$(UPD)$(DLLPOSTFIX).a
#LIB2FILES= $(LB)$/textenc.lib
#.ENDIF
#SHL2TARGET= tec$(UPD)$(DLLPOSTFIX)
#SHL2IMPLIB= itec
#SHL2STDLIBS= $(SALLIB)
#SHL2LIBS= $(SLB)$/textenc.lib
#.IF "$(linkinc)" != ""
#SHL21FILE= $(MISC)$/tec.slo
#.ENDIF
#SHL2DEPN=
#SHL2DEF= $(MISC)$/$(SHL2TARGET).def
#DEF2NAME= $(SHL2TARGET)
#DEF2EXPORTFILE= tec.dxp
#.ENDIF
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.ENDIF .ENDIF # $(header) != ""
.ENDIF # $(depend) != ""
.ENDIF # $(depend)!=""
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(SHL1TARGETN)" != "" .IF "$(SHL1TARGETN)" != ""
$(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h $(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h
.ENDIF # "$(SHL1TARGETN)" != "" .ENDIF # "$(SHL1TARGETN)" != ""