summaryrefslogtreecommitdiff
path: root/offuh
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-04-17 20:34:49 +0200
committerMathias Bauer <mba@openoffice.org>2010-04-17 20:34:49 +0200
commit2e199ef8008fde1da388ef835cd57717b527fef7 (patch)
tree23e1bcf035befe46a18b89c49de3644a79bd7743 /offuh
parentb0a348cf9cb5e0a0565735970a895d20fa50e7a8 (diff)
parent9734c73c9a61fc5ef4e263617add17914a9b5f15 (diff)
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'offuh')
-rw-r--r--offuh/prj/d.lst4
-rw-r--r--offuh/source/makefile.mk6
2 files changed, 3 insertions, 7 deletions
diff --git a/offuh/prj/d.lst b/offuh/prj/d.lst
index f2f087bd9c25..116745834ec3 100644
--- a/offuh/prj/d.lst
+++ b/offuh/prj/d.lst
@@ -242,8 +242,8 @@ mkdir: %_DEST%\inc%_EXT%\offuh\msforms
..\%__SRC%\inc\offuh\com\sun\star\linguistic2\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\linguistic2\*.hpp
..\%__SRC%\inc\offuh\com\sun\star\logging\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hdl
..\%__SRC%\inc\offuh\com\sun\star\logging\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\logging\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hpp
-..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hdl
+..\%__SRC%\inc\offuh\com\sun\star\office\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hpp
+..\%__SRC%\inc\offuh\com\sun\star\office\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\office\*.hdl
..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hdl
..\%__SRC%\inc\offuh\com\sun\star\oooimprovement\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\oooimprovement\*.hpp
..\%__SRC%\inc\offuh\com\sun\star\mail\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\mail\*.hpp
diff --git a/offuh/source/makefile.mk b/offuh/source/makefile.mk
index b83e8f6d9adf..230dc750aa90 100644
--- a/offuh/source/makefile.mk
+++ b/offuh/source/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.10 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify