diff options
author | Xisco Fauli <anistenis@gmail.com> | 2011-08-21 21:50:13 +0200 |
---|---|---|
committer | Xisco Fauli <anistenis@gmail.com> | 2011-08-21 21:50:13 +0200 |
commit | 6c76e4db034fd2c43884698b1a30225fd00b3bfd (patch) | |
tree | 1937cb9be81cd2b9f3d0ad27adcc7a7531b8f29d /forms/Library_frm.mk | |
parent | e9440fb5a0579096423c081b0f0a2185b628e896 (diff) | |
parent | 36703ca1de68cd62782d0d425123521a5bc6732b (diff) |
Merge branch 'master' into feature/gsoc2011_wizards
Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx
Diffstat (limited to 'forms/Library_frm.mk')
-rw-r--r-- | forms/Library_frm.mk | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 1208fa5c5d0c..f99dcb82c7f8 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version @@ -35,13 +36,6 @@ $(eval $(call gb_Library_set_include,frm,\ -I$(realpath $(SRCDIR)/forms/source/inc) \ -I$(realpath $(SRCDIR)/forms/source/solar/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ - $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ -)) - -$(eval $(call gb_Library_set_defs,frm,\ - $$(DEFS) \ - $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \ )) $(eval $(call gb_Library_add_linked_libs,frm,\ @@ -51,8 +45,6 @@ $(eval $(call gb_Library_add_linked_libs,frm,\ dbtools \ editeng \ i18nisolang1 \ - icui18n \ - icuuc \ sal \ sfx \ svl \ @@ -63,10 +55,23 @@ $(eval $(call gb_Library_add_linked_libs,frm,\ ucbhelper \ utl \ vcl \ - xml2 \ $(gb_STDLIBS) \ )) +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_Library_use_externals,frm,\ + icuin \ + icuuc \ + libxml2 \ +)) +else +$(eval $(call gb_Library_use_externals,frm,\ + icui18n \ + icuuc \ + libxml2 \ +)) +endif + $(eval $(call gb_Library_set_componentfile,frm,forms/util/frm)) $(eval $(call gb_Library_add_exception_objects,frm,\ @@ -172,4 +177,4 @@ $(eval $(call gb_Library_add_exception_objects,frm,\ forms/source/xforms/xpathlib/xpathlib \ )) -# vim: set noet ts=4 sw=4: +# vim: set noet sw=4 ts=4: |