diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
| commit | 034c59cb79a203034d52da011c33ad328b86f6e6 (patch) | |
| tree | e48d23a9776aba421ecf745cd90e427624ebf714 /moz | |
| parent | 41355ba9bcddb7f83f4e0d2211e4ea26cce328ec (diff) | |
| parent | 1a7789b3a5dcab90b2746d699c224d34293a098f (diff) | |
ause110: update to DEV300_m74
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/extractfiles.mk | 6 | ||||
| -rw-r--r-- | moz/makefile.mk | 10 | ||||
| -rw-r--r-- | moz/zipped/makefile.mk | 6 |
3 files changed, 5 insertions, 17 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 81e04ab80ad6..c8d88c015411 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: extractfiles.mk,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/moz/makefile.mk b/moz/makefile.mk index ebb817218a92..f232154ad9a0 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -168,7 +164,7 @@ MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT) # create a objdir build = build files in a seperate directory, not in the sourcetree directly CONFIGURE_DIR=$(CPU)_objdir BUILD_DIR=$(CONFIGURE_DIR) -MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="gcc -arch $(MOZ_ARCH)" CXX="g++ -arch $(MOZ_ARCH)" AR=ar +MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch $(MOZ_ARCH)" AR=ar CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS) diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index c8497d36acf9..0ea80c02dc3e 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.17 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |