diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:31 +0200 |
| commit | 9e5584a82633442467a53ccc08c3380070178a38 (patch) | |
| tree | 03ecad6d69523ff70217dd583ac757500135697d /vcl/source/salmain/makefile.mk | |
| parent | 9d4ec37cb09142515a5bc1fdc06beee1f8b0642a (diff) | |
| parent | 73b79fe869dee44b26d79d9e448fa95544a375e7 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
i18npool/inc/i18npool/lang.h
i18npool/source/isolang/isolang.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/graphic/grfmgr.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/sft.hxx
vcl/inc/unx/pspgraphics.h
vcl/inc/vcl/cursor.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/prj/d.lst
vcl/source/app/settings.cxx
vcl/source/control/edit.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/window/cursor.cxx
vcl/source/window/window.cxx
vcl/unx/generic/fontmanager/fontconfig.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'vcl/source/salmain/makefile.mk')
| -rw-r--r-- | vcl/source/salmain/makefile.mk | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/vcl/source/salmain/makefile.mk b/vcl/source/salmain/makefile.mk deleted file mode 100644 index 9c790bf28d75..000000000000 --- a/vcl/source/salmain/makefile.mk +++ /dev/null @@ -1,41 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = vcl -TARGET = salmain -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE: settings.mk - -OBJFILES = $(OBJ)$/salmain.obj - -LIB1TARGET=$(LB)$/vclmain.lib -LIB1ARCHIV=$(LB)$/libvclmain.a -LIB1FILES=$(LB)$/salmain.lib - -.INCLUDE: target.mk |