[Libreoffice-commits] .: 2 commits - cui/AllLangResTarget_cui.mk cui/inc cui/Library_cui.mk cui/Makefile cui/Module_cui.mk cui/prj cui/source cui/util
David Tardon
dtardon at kemper.freedesktop.org
Sat Apr 16 08:17:03 PDT 2011
cui/AllLangResTarget_cui.mk | 133 ++++++++++++++++++++++++
cui/Library_cui.mk | 211 +++++++++++++++++++++++++++++++++++++++
cui/Makefile | 38 +++++++
cui/Module_cui.mk | 35 ++++++
cui/inc/makefile.mk | 48 --------
cui/prj/build.lst | 8 -
cui/prj/d.lst | 8 -
cui/prj/makefile.mk | 40 +++++++
cui/source/customize/makefile.mk | 63 -----------
cui/source/dialogs/makefile.mk | 122 ----------------------
cui/source/factory/makefile.mk | 52 ---------
cui/source/options/makefile.mk | 118 ---------------------
cui/source/options/optspell.hrc | 42 -------
cui/source/options/optspell.src | 120 ----------------------
cui/source/tabpages/makefile.mk | 110 --------------------
cui/util/makefile.mk | 105 -------------------
cui/util/makefile.pmk | 40 -------
17 files changed, 458 insertions(+), 835 deletions(-)
New commits:
commit 0e7c42df725763092a7e1b2fa8da73f4b4b9e459
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 16 14:34:48 2011 +0200
remove unused files
diff --git a/cui/source/options/optspell.hrc b/cui/source/options/optspell.hrc
deleted file mode 100644
index 446b2ad..0000000
--- a/cui/source/options/optspell.hrc
+++ /dev/null
@@ -1,42 +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.
- *
- ************************************************************************/
-
-// defines ---------------------------------------------------------------
-
-#define BTN_OK 10
-#define BTN_CANCEL 11
-#define BTN_BOOK 12
-
-#define LB_BOOK 20
-#define GB_BOOK 21
-
-#define BTN_CAPS 30
-#define BTN_NUMS 31
-#define BTN_UPLOW 32
-#define GB_AUDIT 33
-
-
diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src
deleted file mode 100644
index 1047ebc..0000000
--- a/cui/source/options/optspell.src
+++ /dev/null
@@ -1,120 +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.
- *
- ************************************************************************/
- // include ------------------------------------------------------------------
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include "optspell.hrc"
- // pragma -------------------------------------------------------------------
-
- // RID_SFXPAGE_SPELL --------------------------------------------------------
-TabPage RID_SFXPAGE_SPELL
-{
- HelpId = HID_OPTIONS_SPELL ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 221 , 185 ) ;
- Text [ en-US ] = "Spellcheck" ;
- PushButton BTN_BOOK
- {
- HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK";
- Pos = MAP_APPFONT ( 128 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Edit..." ;
- TabStop = TRUE ;
- };
- MultiListBox LB_BOOK
- {
- HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 103 , 47 ) ;
- TabStop = TRUE ;
- AutoHScroll = TRUE ;
- };
- FixedLine GB_BOOK
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 115 , 66 ) ;
- Text [ en-US ] = "Dictionaries" ;
- };
- CheckBox BTN_CAPS
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS";
- Pos = MAP_APPFONT ( 12 , 82 ) ;
- Size = MAP_APPFONT ( 103 , 10 ) ;
- Text [ en-US ] = "~Capital words" ;
- TabStop = TRUE ;
- };
- CheckBox BTN_NUMS
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS";
- Pos = MAP_APPFONT ( 12 , 95 ) ;
- Size = MAP_APPFONT ( 103 , 10 ) ;
- Text [ en-US ] = "~Words with numbers " ;
- TabStop = TRUE ;
- };
- CheckBox BTN_UPLOW
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW";
- Pos = MAP_APPFONT ( 12 , 108 ) ;
- Size = MAP_APPFONT ( 103 , 10 ) ;
- Text [ en-US ] = "~Case sensitive " ;
- TabStop = TRUE ;
- };
- FixedLine GB_AUDIT
- {
- Pos = MAP_APPFONT ( 6 , 71 ) ;
- Size = MAP_APPFONT ( 115 , 53 ) ;
- Text [ en-US ] = "Check" ;
- };
-};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 08410acd36832d8c38e9e9f0cee11740ef18ff26
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 16 14:28:27 2011 +0200
gbuildize cui
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
new file mode 100644
index 0000000..634866c
--- /dev/null
+++ b/cui/AllLangResTarget_cui.mk
@@ -0,0 +1,133 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,cui,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,cui,\
+ cui/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,cui/res))
+
+$(eval $(call gb_SrsTarget_set_include,cui/res,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/cui/source/inc) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,cui/res,\
+ cui/source/customize/acccfg.src \
+ cui/source/customize/cfg.src \
+ cui/source/customize/eventdlg.src \
+ cui/source/customize/macropg.src \
+ cui/source/customize/selector.src \
+ cui/source/dialogs/about.src \
+ cui/source/dialogs/charmap.src \
+ cui/source/dialogs/commonlingui.src \
+ cui/source/dialogs/cuiimapdlg.src \
+ cui/source/dialogs/dlgname.src \
+ cui/source/dialogs/fmsearch.src \
+ cui/source/dialogs/gallery.src \
+ cui/source/dialogs/grfflt.src \
+ cui/source/dialogs/hangulhanjadlg.src \
+ cui/source/dialogs/hlmarkwn.src \
+ cui/source/dialogs/hyperdlg.src \
+ cui/source/dialogs/hyphen.src \
+ cui/source/dialogs/iconcdlg.src \
+ cui/source/dialogs/insrc.src \
+ cui/source/dialogs/multipat.src \
+ cui/source/dialogs/newtabledlg.src \
+ cui/source/dialogs/passwdomdlg.src \
+ cui/source/dialogs/postdlg.src \
+ cui/source/dialogs/scriptdlg.src \
+ cui/source/dialogs/sdrcelldlg.src \
+ cui/source/dialogs/showcols.src \
+ cui/source/dialogs/SpellDialog.src \
+ cui/source/dialogs/splitcelldlg.src \
+ cui/source/dialogs/srchxtra.src \
+ cui/source/dialogs/svuidlg.src \
+ cui/source/dialogs/tbxform.src \
+ cui/source/dialogs/thesdlg.src \
+ cui/source/dialogs/zoom.src \
+ cui/source/options/connpooloptions.src \
+ cui/source/options/dbregister.src \
+ cui/source/options/doclinkdialog.src \
+ cui/source/options/fontsubs.src \
+ cui/source/options/internationaloptions.src \
+ cui/source/options/optaccessibility.src \
+ cui/source/options/optasian.src \
+ cui/source/options/optchart.src \
+ cui/source/options/optcolor.src \
+ cui/source/options/optctl.src \
+ cui/source/options/optdict.src \
+ cui/source/options/optfltr.src \
+ cui/source/options/optgdlg.src \
+ cui/source/options/optgenrl.src \
+ cui/source/options/opthtml.src \
+ cui/source/options/optimprove.src \
+ cui/source/options/optinet2.src \
+ cui/source/options/optjava.src \
+ cui/source/options/optjsearch.src \
+ cui/source/options/optlingu.src \
+ cui/source/options/optmemory.src \
+ cui/source/options/optpath.src \
+ cui/source/options/optsave.src \
+ cui/source/options/optupdt.src \
+ cui/source/options/readonlyimage.src \
+ cui/source/options/securityoptions.src \
+ cui/source/options/treeopt.src \
+ cui/source/options/webconninfo.src \
+ cui/source/tabpages/align.src \
+ cui/source/tabpages/autocdlg.src \
+ cui/source/tabpages/backgrnd.src \
+ cui/source/tabpages/bbdlg.src \
+ cui/source/tabpages/border.src \
+ cui/source/tabpages/chardlg.src \
+ cui/source/tabpages/connect.src \
+ cui/source/tabpages/dstribut.src \
+ cui/source/tabpages/frmdirlbox.src \
+ cui/source/tabpages/grfpage.src \
+ cui/source/tabpages/labdlg.src \
+ cui/source/tabpages/macroass.src \
+ cui/source/tabpages/measure.src \
+ cui/source/tabpages/numfmt.src \
+ cui/source/tabpages/numpages.src \
+ cui/source/tabpages/page.src \
+ cui/source/tabpages/paragrph.src \
+ cui/source/tabpages/strings.src \
+ cui/source/tabpages/swpossizetabpage.src \
+ cui/source/tabpages/tabarea.src \
+ cui/source/tabpages/tabline.src \
+ cui/source/tabpages/tabstpge.src \
+ cui/source/tabpages/textanim.src \
+ cui/source/tabpages/textattr.src \
+ cui/source/tabpages/transfrm.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
new file mode 100644
index 0000000..94f11d4
--- /dev/null
+++ b/cui/Library_cui.mk
@@ -0,0 +1,211 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,cui))
+
+$(eval $(call gb_Library_add_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precompiled_cui))
+
+$(eval $(call gb_Library_set_include,cui,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/cui/source/inc) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,cui,\
+ $$(DEFS) \
+ $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
+ $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
+ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
+))
+
+# .IF "$(ENABLE_LAYOUT)" == "TRUE"
+# CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+# .ENDIF # ENABLE_LAYOUT == TRUE
+
+$(eval $(call gb_Library_add_linked_libs,cui,\
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18nisolang1 \
+ icuuc \
+ jvmfwk \
+ lng \
+ sal \
+ sb \
+ sfx \
+ svl \
+ svt \
+ svxcore \
+ svx \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,cui,\
+ advapi32 \
+ shlwapi \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,cui,\
+ cui/source/customize/acccfg \
+ cui/source/customize/cfg \
+ cui/source/customize/cfgutil \
+ cui/source/customize/eventdlg \
+ cui/source/customize/macropg \
+ cui/source/customize/selector \
+ cui/source/dialogs/about \
+ cui/source/dialogs/commonlingui \
+ cui/source/dialogs/cuicharmap \
+ cui/source/dialogs/cuifmsearch \
+ cui/source/dialogs/cuigaldlg \
+ cui/source/dialogs/cuigrfflt \
+ cui/source/dialogs/cuihyperdlg \
+ cui/source/dialogs/cuiimapwnd \
+ cui/source/dialogs/cuitbxform \
+ cui/source/dialogs/dlgname \
+ cui/source/dialogs/hangulhanjadlg \
+ cui/source/dialogs/hldocntp \
+ cui/source/dialogs/hldoctp \
+ cui/source/dialogs/hlinettp \
+ cui/source/dialogs/hlmailtp \
+ cui/source/dialogs/hlmarkwn \
+ cui/source/dialogs/hltpbase \
+ cui/source/dialogs/hyphen \
+ cui/source/dialogs/iconcdlg \
+ cui/source/dialogs/insdlg \
+ cui/source/dialogs/insrc \
+ cui/source/dialogs/linkdlg \
+ cui/source/dialogs/multifil \
+ cui/source/dialogs/multipat \
+ cui/source/dialogs/newtabledlg \
+ cui/source/dialogs/passwdomdlg \
+ cui/source/dialogs/pastedlg \
+ cui/source/dialogs/plfilter \
+ cui/source/dialogs/postdlg \
+ cui/source/dialogs/scriptdlg \
+ cui/source/dialogs/sdrcelldlg \
+ cui/source/dialogs/showcols \
+ cui/source/dialogs/SpellAttrib \
+ cui/source/dialogs/SpellDialog \
+ cui/source/dialogs/splitcelldlg \
+ cui/source/dialogs/srchxtra \
+ cui/source/dialogs/thesdlg \
+ cui/source/dialogs/zoom \
+ cui/source/factory/cuiexp \
+ cui/source/factory/cuiresmgr \
+ cui/source/factory/dlgfact \
+ cui/source/factory/init \
+ cui/source/options/cfgchart \
+ cui/source/options/connpoolconfig \
+ cui/source/options/connpooloptions \
+ cui/source/options/connpoolsettings \
+ cui/source/options/cuisrchdlg \
+ cui/source/options/dbregister \
+ cui/source/options/dbregisterednamesconfig \
+ cui/source/options/dbregistersettings \
+ cui/source/options/doclinkdialog \
+ cui/source/options/fontsubs \
+ cui/source/options/internationaloptions \
+ cui/source/options/optaccessibility \
+ cui/source/options/optasian \
+ cui/source/options/optchart \
+ cui/source/options/optcolor \
+ cui/source/options/optctl \
+ cui/source/options/optdict \
+ cui/source/options/optfltr \
+ cui/source/options/optgdlg \
+ cui/source/options/optgenrl \
+ cui/source/options/optHeaderTabListbox \
+ cui/source/options/opthtml \
+ cui/source/options/optimprove2 \
+ cui/source/options/optimprove \
+ cui/source/options/optinet2 \
+ cui/source/options/optjava \
+ cui/source/options/optjsearch \
+ cui/source/options/optlingu \
+ cui/source/options/optmemory \
+ cui/source/options/optpath \
+ cui/source/options/optsave \
+ cui/source/options/optupdt \
+ cui/source/options/radiobtnbox \
+ cui/source/options/readonlyimage \
+ cui/source/options/sdbcdriverenum \
+ cui/source/options/securityoptions \
+ cui/source/options/treeopt \
+ cui/source/options/webconninfo \
+ cui/source/tabpages/align \
+ cui/source/tabpages/autocdlg \
+ cui/source/tabpages/backgrnd \
+ cui/source/tabpages/bbdlg \
+ cui/source/tabpages/borderconn \
+ cui/source/tabpages/border \
+ cui/source/tabpages/chardlg \
+ cui/source/tabpages/connect \
+ cui/source/tabpages/dstribut \
+ cui/source/tabpages/grfpage \
+ cui/source/tabpages/labdlg \
+ cui/source/tabpages/macroass \
+ cui/source/tabpages/measure \
+ cui/source/tabpages/numfmt \
+ cui/source/tabpages/numpages \
+ cui/source/tabpages/page \
+ cui/source/tabpages/paragrph \
+ cui/source/tabpages/swpossizetabpage \
+ cui/source/tabpages/tabarea \
+ cui/source/tabpages/tabline \
+ cui/source/tabpages/tabstpge \
+ cui/source/tabpages/textanim \
+ cui/source/tabpages/textattr \
+ cui/source/tabpages/tparea \
+ cui/source/tabpages/tpbitmap \
+ cui/source/tabpages/tpcolor \
+ cui/source/tabpages/tpgradnt \
+ cui/source/tabpages/tphatch \
+ cui/source/tabpages/tpline \
+ cui/source/tabpages/tplnedef \
+ cui/source/tabpages/tplneend \
+ cui/source/tabpages/tpshadow \
+ cui/source/tabpages/transfrm \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_exception_objects,cui,\
+ cui/source/dialogs/winpluginlib \
+))
+endif
+
+# vim: set noet ts=4 sw=4:
diff --git a/cui/Makefile b/cui/Makefile
new file mode 100644
index 0000000..a79aff8
--- /dev/null
+++ b/cui/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
new file mode 100644
index 0000000..aaab8df
--- /dev/null
+++ b/cui/Module_cui.mk
@@ -0,0 +1,35 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,cui))
+
+$(eval $(call gb_Module_add_targets,cui,\
+ AllLangResTarget_cui \
+ Library_cui \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/cui/inc/makefile.mk b/cui/inc/makefile.mk
deleted file mode 100644
index 4153637..0000000
--- a/cui/inc/makefile.mk
+++ /dev/null
@@ -1,48 +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=cui
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/cui/prj/build.lst b/cui/prj/build.lst
index 776d6a6..47ded1f 100644
--- a/cui/prj/build.lst
+++ b/cui/prj/build.lst
@@ -1,9 +1,3 @@
cu cui : svx NULL
cu cui usr1 - all cui_mkout NULL
-cu cui\inc nmake - all cui_inc NULL
-cu cui\source\options nmake - all cui_options cui_inc NULL
-cu cui\source\customize nmake - all cui_customize cui_inc NULL
-cu cui\source\dialogs nmake - all cui_dialogs cui_inc NULL
-cu cui\source\tabpages nmake - all cui_tabpages cui_inc NULL
-cu cui\source\factory nmake - all cui_factory cui_inc NULL
-cu cui\util nmake - all cui_util cui_factory cui_tabpages cui_dialogs cui_customize cui_options NULL
+cu cui\prj nmake - all cui_prj NULL
diff --git a/cui/prj/d.lst b/cui/prj/d.lst
index ce67271..e69de29 100644
--- a/cui/prj/d.lst
+++ b/cui/prj/d.lst
@@ -1,8 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-
diff --git a/cui/prj/makefile.mk b/cui/prj/makefile.mk
new file mode 100755
index 0000000..e312a7c
--- /dev/null
+++ b/cui/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/cui/source/customize/makefile.mk b/cui/source/customize/makefile.mk
deleted file mode 100644
index 4b7f5d1..0000000
--- a/cui/source/customize/makefile.mk
+++ /dev/null
@@ -1,63 +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=cui
-TARGET=customize
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=customize
-SRC1FILES = \
- acccfg.src \
- cfg.src \
- eventdlg.src \
- macropg.src \
- selector.src \
-
-
-SLOFILES+=\
- $(SLO)$/acccfg.obj \
- $(SLO)$/cfg.obj \
- $(SLO)$/cfgutil.obj \
- $(SLO)$/eventdlg.obj \
- $(SLO)$/macropg.obj \
- $(SLO)$/selector.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk
deleted file mode 100644
index 67bc596..0000000
--- a/cui/source/dialogs/makefile.mk
+++ /dev/null
@@ -1,122 +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=cui
-TARGET=dialogs
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=dialogs
-SRC1FILES = \
- about.src \
- charmap.src \
- commonlingui.src \
- cuiimapdlg.src \
- dlgname.src \
- fmsearch.src \
- gallery.src \
- grfflt.src \
- hangulhanjadlg.src \
- hyphen.src \
- hlmarkwn.src \
- hyperdlg.src \
- iconcdlg.src \
- insrc.src \
- multipat.src \
- newtabledlg.src \
- passwdomdlg.src \
- postdlg.src \
- scriptdlg.src \
- sdrcelldlg.src \
- showcols.src \
- SpellDialog.src \
- splitcelldlg.src \
- srchxtra.src \
- svuidlg.src \
- tbxform.src \
- thesdlg.src \
- zoom.src \
-
-
-SLOFILES+=\
- $(SLO)$/about.obj \
- $(SLO)$/commonlingui.obj \
- $(SLO)$/cuicharmap.obj \
- $(SLO)$/cuifmsearch.obj \
- $(SLO)$/cuigaldlg.obj \
- $(SLO)$/cuigrfflt.obj \
- $(SLO)$/cuihyperdlg.obj \
- $(SLO)$/cuiimapwnd.obj \
- $(SLO)$/cuitbxform.obj \
- $(SLO)$/dlgname.obj \
- $(SLO)$/hangulhanjadlg.obj \
- $(SLO)$/hldocntp.obj \
- $(SLO)$/hldoctp.obj \
- $(SLO)$/hlinettp.obj \
- $(SLO)$/hlmailtp.obj \
- $(SLO)$/hlmarkwn.obj \
- $(SLO)$/hltpbase.obj \
- $(SLO)$/hyphen.obj \
- $(SLO)$/iconcdlg.obj \
- $(SLO)$/insdlg.obj \
- $(SLO)$/insrc.obj \
- $(SLO)$/linkdlg.obj \
- $(SLO)$/multifil.obj \
- $(SLO)$/multipat.obj \
- $(SLO)$/newtabledlg.obj \
- $(SLO)$/passwdomdlg.obj \
- $(SLO)$/pastedlg.obj \
- $(SLO)$/plfilter.obj \
- $(SLO)$/postdlg.obj \
- $(SLO)$/scriptdlg.obj \
- $(SLO)$/sdrcelldlg.obj \
- $(SLO)$/showcols.obj \
- $(SLO)$/SpellAttrib.obj \
- $(SLO)$/SpellDialog.obj \
- $(SLO)$/splitcelldlg.obj \
- $(SLO)$/srchxtra.obj \
- $(SLO)$/thesdlg.obj \
- $(SLO)$/zoom.obj \
-
-
-.IF "$(GUI)"=="WNT"
-SLOFILES+=$(SLO)$/winpluginlib.obj
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cui/source/factory/makefile.mk b/cui/source/factory/makefile.mk
deleted file mode 100644
index 1ccbbdb..0000000
--- a/cui/source/factory/makefile.mk
+++ /dev/null
@@ -1,52 +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=cui
-TARGET=factory
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Files --------------------------------------------------------
-
-SLOFILES+=\
- $(SLO)$/dlgfact.obj \
- $(SLO)$/cuiexp.obj \
- $(SLO)$/cuiresmgr.obj \
- $(SLO)$/init.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cui/source/options/makefile.mk b/cui/source/options/makefile.mk
deleted file mode 100644
index 8aa9f7e..0000000
--- a/cui/source/options/makefile.mk
+++ /dev/null
@@ -1,118 +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=cui
-TARGET=options
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=options
-SRC1FILES = \
- connpooloptions.src \
- dbregister.src \
- doclinkdialog.src \
- fontsubs.src \
- internationaloptions.src \
- optaccessibility.src \
- optasian.src \
- optchart.src \
- optcolor.src \
- optctl.src \
- optdict.src \
- optfltr.src \
- optgdlg.src \
- optgenrl.src \
- opthtml.src \
- optimprove.src \
- optinet2.src \
- optjava.src \
- optjsearch.src \
- optlingu.src \
- optmemory.src \
- optpath.src \
- optsave.src \
- optupdt.src \
- readonlyimage.src \
- securityoptions.src \
- treeopt.src \
- webconninfo.src \
-
-
-SLOFILES+=\
- $(SLO)$/cfgchart.obj \
- $(SLO)$/connpoolconfig.obj \
- $(SLO)$/connpooloptions.obj \
- $(SLO)$/connpoolsettings.obj \
- $(SLO)$/cuisrchdlg.obj \
- $(SLO)$/dbregister.obj \
- $(SLO)$/dbregisterednamesconfig.obj \
- $(SLO)$/dbregistersettings.obj \
- $(SLO)$/doclinkdialog.obj \
- $(SLO)$/fontsubs.obj \
- $(SLO)$/internationaloptions.obj \
- $(SLO)$/optaccessibility.obj \
- $(SLO)$/optasian.obj \
- $(SLO)$/optchart.obj \
- $(SLO)$/optcolor.obj \
- $(SLO)$/optctl.obj \
- $(SLO)$/optdict.obj \
- $(SLO)$/optfltr.obj \
- $(SLO)$/optgdlg.obj \
- $(SLO)$/optgenrl.obj \
- $(SLO)$/optHeaderTabListbox.obj \
- $(SLO)$/opthtml.obj \
- $(SLO)$/optimprove.obj \
- $(SLO)$/optimprove2.obj \
- $(SLO)$/optinet2.obj \
- $(SLO)$/optjava.obj \
- $(SLO)$/optjsearch.obj \
- $(SLO)$/optlingu.obj \
- $(SLO)$/optmemory.obj \
- $(SLO)$/optpath.obj \
- $(SLO)$/optsave.obj \
- $(SLO)$/optupdt.obj \
- $(SLO)$/radiobtnbox.obj \
- $(SLO)$/readonlyimage.obj \
- $(SLO)$/sdbcdriverenum.obj \
- $(SLO)$/securityoptions.obj \
- $(SLO)$/treeopt.obj \
- $(SLO)$/webconninfo.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cui/source/tabpages/makefile.mk b/cui/source/tabpages/makefile.mk
deleted file mode 100644
index 362f46c..0000000
--- a/cui/source/tabpages/makefile.mk
+++ /dev/null
@@ -1,110 +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=cui
-TARGET=tabpages
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=tabpages
-SRC1FILES = \
- align.src \
- autocdlg.src \
- backgrnd.src \
- bbdlg.src \
- border.src \
- chardlg.src \
- connect.src \
- dstribut.src \
- frmdirlbox.src \
- grfpage.src \
- labdlg.src \
- macroass.src \
- measure.src \
- numfmt.src \
- numpages.src \
- page.src \
- paragrph.src \
- strings.src \
- swpossizetabpage.src \
- tabarea.src \
- tabline.src \
- tabstpge.src \
- textanim.src \
- textattr.src \
- transfrm.src
-
-
-SLOFILES+=\
- $(SLO)$/align.obj \
- $(SLO)$/autocdlg.obj \
- $(SLO)$/backgrnd.obj \
- $(SLO)$/bbdlg.obj \
- $(SLO)$/border.obj \
- $(SLO)$/borderconn.obj \
- $(SLO)$/chardlg.obj \
- $(SLO)$/connect.obj \
- $(SLO)$/dstribut.obj \
- $(SLO)$/grfpage.obj \
- $(SLO)$/labdlg.obj \
- $(SLO)$/macroass.obj \
- $(SLO)$/measure.obj \
- $(SLO)$/numfmt.obj \
- $(SLO)$/numpages.obj \
- $(SLO)$/page.obj \
- $(SLO)$/paragrph.obj \
- $(SLO)$/swpossizetabpage.obj \
- $(SLO)$/tabarea.obj \
- $(SLO)$/tabline.obj \
- $(SLO)$/tabstpge.obj \
- $(SLO)$/textanim.obj \
- $(SLO)$/textattr.obj \
- $(SLO)$/tparea.obj \
- $(SLO)$/tpbitmap.obj \
- $(SLO)$/tpcolor.obj \
- $(SLO)$/tpgradnt.obj \
- $(SLO)$/tphatch.obj \
- $(SLO)$/tpline.obj \
- $(SLO)$/tplnedef.obj \
- $(SLO)$/tplneend.obj \
- $(SLO)$/tpshadow.obj \
- $(SLO)$/transfrm.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk
deleted file mode 100644
index 5059b9b..0000000
--- a/cui/util/makefile.mk
+++ /dev/null
@@ -1,105 +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=cui
-TARGET=cui
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(OS)"=="IRIX"
-LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
-.ENDIF
-
-SHL1TARGET= cui$(DLLPOSTFIX)
-SHL1VERSIONMAP= cui.map
-SHL1IMPLIB=icui
-SHL1DEPN=
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-SHL1LIBS= \
- $(SLB)$/options.lib \
- $(SLB)$/customize.lib \
- $(SLB)$/dialogs.lib \
- $(SLB)$/tabpages.lib \
- $(SLB)$/factory.lib
-
-
-SHL1STDLIBS= \
- $(EDITENGLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(AVMEDIALIB) \
- $(SFX2LIB) \
- $(BASEGFXLIB) \
- $(BASICLIB) \
- $(LNGLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(JVMFWKLIB) \
- $(ICUUCLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
- $(SHLWAPILIB) \
- $(ADVAPI32LIB)
-.ENDIF # WNT
-
-# ------------------------------------------------------------------------------
-
-# Resource files
-SRSFILELIST=\
- $(SRS)$/options.srs \
- $(SRS)$/dialogs.srs \
- $(SRS)$/tabpages.srs \
- $(SRS)$/customize.srs \
-
-
-RESLIB1NAME=cui
-RESLIB1IMAGES=$(SOLARDEFIMG)/svx/res
-RESLIB1SRSFILES= $(SRSFILELIST)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/cui/util/makefile.pmk b/cui/util/makefile.pmk
deleted file mode 100644
index 5d4fb6b..0000000
--- a/cui/util/makefile.pmk
+++ /dev/null
@@ -1,40 +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.
-#
-#*************************************************************************
-
-.IF "$(ENABLE_GTK)" != ""
-CFLAGS+=-DENABLE_GTK
-.ENDIF
-
-.IF "$(ENABLE_KDE)" != ""
-CFLAGS+=-DENABLE_KDE
-.ENDIF
-
-.IF "$(ENABLE_KDE4)" != ""
-CFLAGS+=-DENABLE_KDE4
-.ENDIF
-
-VISIBILITY_HIDDEN=TRUE
More information about the Libreoffice-commits
mailing list