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

INTEGRATION: CWS c01v005 (1.90.26); FILE MERGED

Browse source 
2005/03/08 08:48:35 as 1.90.26.4: #119880# reactivate HelpOnStartup job; fix some configuration issues; create new framework lib fwm
2005/03/05 00:22:09 hjs 1.90.26.3: RESYNC: (1.90-1.92); FILE MERGED
2005/03/02 13:49:01 as 1.90.26.2: #119880# reactivate HelpOnStartup job
2005/02/22 17:01:47 cd 1.90.26.1: #119876# new statusbar logo controllers
This commit is contained in:
Oliver Bolte 2005-03-15 11:57:58 +00:00
parent a05e273bc8
commit bbe1650313
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
framework/util/makefile.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.92 $
# $Revision: 1.93 $
#
# last change: $Author: vg $ $Date: 2005-02-18 09:16:01 $
# last change: $Author: obo $ $Date: 2005-03-15 12:57:58 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -332,9 +332,11 @@ SHL4OBJS= \
$(SLO)$/uicategorydescription.obj \
$(SLO)$/vclstatusindicator.obj \
$(SLO)$/wakeupthread.obj \
$(SLO)$/sessionlistener.obj \
$(SLO)$/newmenucontroller.obj \
$(SLO)$/sessionlistener.obj
$(SLO)$/logoimagestatusbarcontroller.obj \
$(SLO)$/logotextstatusbarcontroller.obj
SHL4STDLIBS= \
$(FWILIB) \
$(FWELIB) \
@ -359,6 +361,32 @@ DEF4NAME= $(SHL4TARGET)
SHL4VERSIONMAP= exports.map
# --- services library ----------------------------------------------------
SHL5TARGET= fwm$(UPD)$(DLLPOSTFIX)
SHL5IMPLIB= ifwm
SHL5OBJS= \
$(SLO)$/helponstartup.obj \
$(SLO)$/register3rdcomponents.obj
SHL5STDLIBS= \
$(FWILIB) \
$(VCLLIB) \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
SHL5DEF= $(MISC)$/$(SHL5TARGET).def
SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
DEF5NAME= $(SHL5TARGET)
SHL5VERSIONMAP= exports.map
# --- Targets -----------------------------------------------------------------
.INCLUDE : target.mk