diff options
| author | sb <sb@openoffice.org> | 2010-02-25 13:53:42 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 13:53:42 +0100 |
| commit | 5bdd72d815955fc602fe7494c03a61650f2bd0ce (patch) | |
| tree | 50956886eb937d401291b01853470a43c74d098a /configmgr/qa | |
| parent | 83fd69ccc3e235f494b9dc08bd246e591f76d7cc (diff) | |
| parent | 4d8175599b8d193aba6eef89ef905c830b87d7e7 (diff) | |
sb111: merged in DEV300_m72
Diffstat (limited to 'configmgr/qa')
| -rw-r--r-- | configmgr/qa/unit/makefile.mk | 23 | ||||
| -rw-r--r-- | configmgr/qa/unoapi/makefile.mk | 8 |
2 files changed, 7 insertions, 24 deletions
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index 206650eafd33..916c40ffedf5 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -1,20 +1,11 @@ #************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -<<<<<<< local -# Copyright 2009 by Sun Microsystems, Inc. -======= # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. ->>>>>>> other +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,6 +22,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ PRJ = ../.. @@ -43,22 +35,15 @@ ENABLE_EXCEPTIONS = TRUE SLOFILES = $(SLO)/test.obj -<<<<<<< local SHL1OBJS = $(SLOFILES) SHL1STDLIBS = \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(CPPUNITLIB) \ - $(SALLIB) + $(SALLIB) \ + $(TESTSHL2LIB) SHL1TARGET = unit SHL1VERSIONMAP = version.map -======= -SHL1TARGET = $(TARGET) -SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) -SHL1VERSIONMAP = export.map -SHL1IMPLIB = i$(SHL1TARGET) ->>>>>>> other DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk index 489e79b1490d..5af6b0729660 100644 --- a/configmgr/qa/unoapi/makefile.mk +++ b/configmgr/qa/unoapi/makefile.mk @@ -1,14 +1,11 @@ #************************************************************************* +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -25,6 +22,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ PRJ = ../.. |