diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 10:07:24 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 10:07:24 +0000 |
commit | 84c40cebace65d8b1aff86a1a0871cad7adfccc1 (patch) | |
tree | 15c8bb40c1e487a8c019ea9f1658d4ff8e1dfac6 | |
parent | f5bd4673a8c9e273c6d7000f8cb2230e8aec1b44 (diff) |
INTEGRATION: CWS fwkmerge1 (1.25.38); FILE MERGED
2004/02/18 12:59:19 lo 1.25.38.1: #i25371# move license dialog to Desktop::Main()
-rw-r--r-- | desktop/source/app/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index 21989139f126..06c990a2ecc0 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.25 $ +# $Revision: 1.26 $ # -# last change: $Author: hr $ $Date: 2003-11-07 14:52:30 $ +# last change: $Author: hr $ $Date: 2004-03-09 11:07:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -97,7 +97,9 @@ OBJFILES = \ $(OBJ)$/checkinstall.obj \ $(OBJ)$/langselect.obj \ $(OBJ)$/cmdlinehelp.obj \ - $(OBJ)$/userinstall.obj + $(OBJ)$/userinstall.obj \ + $(OBJ)$/license.obj + .IF "$(GUI)" == "UNX" .IF "$(OS)" != "MACOSX" |