[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/AllLangResTarget_cui.mk cui/inc cui/Library_cui.mk cui/Makefile cui/Module_cui.mk cui/prj cui/source cui/util Module_ooo.mk
Damjan Jovanovic
damjan at apache.org
Fri Jan 6 00:08:36 UTC 2017
Module_ooo.mk | 1
cui/AllLangResTarget_cui.mk | 128 ++++++++++++++++++
cui/Library_cui.mk | 226 ++++++++++++++++++++++++++++++++
cui/Makefile | 32 ++++
cui/Module_cui.mk | 31 ++++
cui/inc/makefile.mk | 44 ------
cui/prj/build.lst | 10 -
cui/prj/d.lst | 10 -
cui/prj/makefile.mk | 44 ++++++
cui/source/customize/makefile.mk | 59 --------
cui/source/dialogs/makefile.mk | 128 ------------------
cui/source/factory/makefile.mk | 48 ------
cui/source/options/makefile.mk | 114 ----------------
cui/source/options/optaccessibility.src | 2
cui/source/options/optasian.src | 2
cui/source/tabpages/makefile.mk | 106 ---------------
cui/source/tabpages/numpages.src | 2
cui/source/uno/services/makefile.mk | 39 -----
cui/util/cui.map | 29 ----
cui/util/makefile.mk | 113 ----------------
cui/util/makefile.pmk | 36 -----
21 files changed, 466 insertions(+), 738 deletions(-)
New commits:
commit 258c5336495c330e41bc259481ffa253589ff31c
Author: Damjan Jovanovic <damjan at apache.org>
Date: Thu Jan 5 21:43:42 2017 +0000
Port main/cui to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 5ab4f2e..ecebf7b 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
comphelper \
configmgr \
cppcanvas \
+ cui \
dbaccess \
drawinglayer \
dtrans \
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
new file mode 100644
index 0000000..82c9ada
--- /dev/null
+++ b/cui/AllLangResTarget_cui.mk
@@ -0,0 +1,128 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(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$(SRCDIR)/cui/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(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/colorpicker.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/hyphen.src \
+ cui/source/dialogs/hlmarkwn.src \
+ cui/source/dialogs/hyperdlg.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 sw=4 ts=4:
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
new file mode 100644
index 0000000..a334708
--- /dev/null
+++ b/cui/Library_cui.mk
@@ -0,0 +1,226 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(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_componentfile,cui,cui/util/cui))
+
+$(eval $(call gb_Library_set_include,cui,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/cui/inc/pch \
+ -I$(SRCDIR)/cui/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,cui,\
+ -DBUILD_VER_STRING="$(BUILD_VER_STRING)" \
+ -DCOPYRIGHT_YEAR=$(shell perl -e 'use POSIX qw(strftime); print strftime("%Y", gmtime($$ENV{SOURCE_DATE_EPOCH} || time));') \
+))
+
+ifeq ($(ENABLE_GTK),TRUE)
+$(eval $(call gb_Library_add_defs,cui,-DENABLE_GTK))
+endif
+
+ifeq ($(ENABLE_KDE),TRUE)
+$(eval $(call gb_Library_add_defs,cui,-DENABLE_KDE))
+endif
+
+ifeq ($(ENABLE_KDE4),TRUE)
+$(eval $(call gb_Library_add_defs,cui,-DENABLE_KDE4))
+endif
+
+$(eval $(call gb_Library_add_api,cui,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cui,\
+ avmedia \
+ basegfx \
+ comphelper \
+ cppuhelper \
+ cppu \
+ editeng \
+ i18nisolang1 \
+ jvmfwk \
+ lng \
+ ootk \
+ sal \
+ sb \
+ sax \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,cui,\
+ advapi32 \
+ shlwapi \
+))
+endif
+
+$(call gb_Library_use_external,cui,icuuc)
+
+$(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/colorpicker \
+ 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/dlgfact \
+ cui/source/factory/cuiexp \
+ cui/source/factory/cuiresmgr \
+ 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/optimprove \
+ cui/source/options/optimprove2 \
+ 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/border \
+ cui/source/tabpages/borderconn \
+ 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 \
+ cui/source/uno/services/services \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_exception_objects,cui,\
+ cui/source/dialogs/winpluginlib \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cui/source/uno/services/makefile.mk b/cui/Makefile
similarity index 70%
rename from cui/source/uno/services/makefile.mk
rename to cui/Makefile
index 031dc92..c1d144c 100644
--- a/cui/source/uno/services/makefile.mk
+++ b/cui/Makefile
@@ -19,21 +19,14 @@
#
#**************************************************************
-PRJ=..$/..$/..
-PRJNAME=cui
-TARGET=services
-ENABLE_EXCEPTIONS=TRUE
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-# --- Settings -----------------------------------------------------
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-# --- Files --------------------------------------------------------
-
-SLOFILES+=\
- $(SLO)$/services.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/cui/util/makefile.pmk b/cui/Module_cui.mk
similarity index 83%
rename from cui/util/makefile.pmk
rename to cui/Module_cui.mk
index a2c449a..c6018d6 100644
--- a/cui/util/makefile.pmk
+++ b/cui/Module_cui.mk
@@ -21,16 +21,11 @@
-.IF "$(ENABLE_GTK)" != ""
-CFLAGS+=-DENABLE_GTK
-.ENDIF
+$(eval $(call gb_Module_Module,cui))
-.IF "$(ENABLE_KDE)" != ""
-CFLAGS+=-DENABLE_KDE
-.ENDIF
+$(eval $(call gb_Module_add_targets,cui,\
+ AllLangResTarget_cui \
+ Library_cui \
+))
-.IF "$(ENABLE_KDE4)" != ""
-CFLAGS+=-DENABLE_KDE4
-.ENDIF
-
-VISIBILITY_HIDDEN=TRUE
+# vim: set noet sw=4 ts=4:
diff --git a/cui/prj/build.lst b/cui/prj/build.lst
index b72fb20..5f34fc9 100644
--- a/cui/prj/build.lst
+++ b/cui/prj/build.lst
@@ -1,10 +1,2 @@
cu cui : svx sax sot 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\source\uno\services nmake - all cui_uno_services cui_inc NULL
-cu cui\util nmake - all cui_util cui_factory cui_tabpages cui_dialogs cui_customize cui_options cui_uno_services NULL
+cu cui\prj nmake - all cui_prj NULL
diff --git a/cui/prj/d.lst b/cui/prj/d.lst
index 982f143..e69de29 100644
--- a/cui/prj/d.lst
+++ b/cui/prj/d.lst
@@ -1,10 +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*.*
-
-mkdir: %COMMON_DEST%\xml%_EXT%\component\cui\util
-..\%__SRC%\misc\cui.component %_DEST%\xml%_EXT%\component\cui\util\cui.component
diff --git a/cui/inc/makefile.mk b/cui/prj/makefile.mk
similarity index 71%
rename from cui/inc/makefile.mk
rename to cui/prj/makefile.mk
index 194c905..c62c6a6 100644
--- a/cui/inc/makefile.mk
+++ b/cui/prj/makefile.mk
@@ -22,23 +22,23 @@
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)"!=""
-
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/cui/source/customize/makefile.mk b/cui/source/customize/makefile.mk
deleted file mode 100644
index 7b4ea8d..0000000
--- a/cui/source/customize/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the 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 03a657f..0000000
--- a/cui/source/dialogs/makefile.mk
+++ /dev/null
@@ -1,128 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the 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
-
-.IF "$(BUILD_VER_STRING)" != ""
-CFLAGS+= -DBUILD_VER_STRING="$(BUILD_VER_STRING)"
-.ENDIF
-
-# compile date (year) = copyright year used in About dialog
-CFLAGS+= -DCOPYRIGHT_YEAR="$(shell date +"%Y")"
-
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=dialogs
-SRC1FILES = \
- about.src \
- colorpicker.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)$/colorpicker.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 24b6de0..0000000
--- a/cui/source/factory/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the 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 20fe3e5..0000000
--- a/cui/source/options/makefile.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the 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/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 46fdf3e..f305324 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -21,7 +21,7 @@
-#include <optaccessibility.hrc>
+#include "optaccessibility.hrc"
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index 87bdd99..213c49a 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -21,7 +21,7 @@
-#include <optasian.hrc>
+#include "optasian.hrc"
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
diff --git a/cui/source/tabpages/makefile.mk b/cui/source/tabpages/makefile.mk
deleted file mode 100644
index e9f6318..0000000
--- a/cui/source/tabpages/makefile.mk
+++ /dev/null
@@ -1,106 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the 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/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 6520a66..102acdb 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -23,7 +23,7 @@
#include <cuires.hrc>
#include <helpid.hrc>
-#include <numpages.hrc>
+#include "numpages.hrc"
#include <svx/dialogs.hrc>
/**************************************************************************/
diff --git a/cui/util/cui.map b/cui/util/cui.map
deleted file mode 100644
index 4e25da9..0000000
--- a/cui/util/cui.map
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-###############################################################
-UDK_3_0_0 {
- global:
- CreateDialogFactory;
- GetSpecialCharsForEdit;
- component_getImplementationEnvironment;
- component_getFactory;
- local:
- *;
-};
diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk
deleted file mode 100644
index 6a161c2..0000000
--- a/cui/util/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the 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 \
- $(SLB)$/services.lib
-
-
-SHL1STDLIBS= \
- $(SAXLIB) \
- $(SOTLIB) \
- $(EDITENGLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(AVMEDIALIB) \
- $(SFX2LIB) \
- $(BASEGFXLIB) \
- $(BASICLIB) \
- $(LNGLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(VOSLIB) \
- $(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=$(SOLARSRC)/$(RSCDEFIMG)/svx/res
-RESLIB1SRSFILES= $(SRSFILELIST)
-
-# --- Targets -------------------------------------------------------
-
-ALLTAR : $(MISC)/cui.component
-
-$(MISC)/cui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- cui.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt cui.component
-
-.INCLUDE : target.mk
-
More information about the Libreoffice-commits
mailing list