From 9fee4241abc62a2a5924698ecaf4fa77e90a57b5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 2 Mar 2011 18:41:59 +0100 Subject: CWS gnumake4: convert xmlreader to new build system [hg:751b4a1bff7b] --- xmlreader/Library_xmlreader.mk | 55 +++++++++++++++++++++++++++++ xmlreader/Makefile | 38 ++++++++++++++++++++ xmlreader/Module_xmlreader.mk | 35 ++++++++++++++++++ xmlreader/Package_inc.mk | 34 ++++++++++++++++++ xmlreader/inc/makefile.mk | 40 --------------------- xmlreader/inc/pch/precompiled_xmlreader.cxx | 28 --------------- xmlreader/inc/pch/precompiled_xmlreader.hxx | 32 ----------------- xmlreader/prj/d.lst | 10 ------ xmlreader/prj/makefile.mk | 40 +++++++++++++++++++++ xmlreader/source/makefile.mk | 53 --------------------------- xmlreader/source/pad.cxx | 2 -- xmlreader/source/span.cxx | 2 -- xmlreader/source/xmlreader.cxx | 1 - 13 files changed, 202 insertions(+), 168 deletions(-) create mode 100644 xmlreader/Library_xmlreader.mk create mode 100644 xmlreader/Makefile create mode 100644 xmlreader/Module_xmlreader.mk create mode 100644 xmlreader/Package_inc.mk delete mode 100644 xmlreader/inc/makefile.mk delete mode 100644 xmlreader/inc/pch/precompiled_xmlreader.cxx delete mode 100644 xmlreader/inc/pch/precompiled_xmlreader.hxx create mode 100644 xmlreader/prj/makefile.mk delete mode 100644 xmlreader/source/makefile.mk diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk new file mode 100644 index 000000000..f7ad24377 --- /dev/null +++ b/xmlreader/Library_xmlreader.mk @@ -0,0 +1,55 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,xmlreader)) + +$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,xmlreader,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,xmlreader,\ + $$(DEFS) \ + -DOOO_DLLIMPLEMENTATION_XMLREADER \ +)) + +$(eval $(call gb_Library_add_linked_libs,xmlreader,\ + sal \ + stl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,xmlreader,\ + xmlreader/source/pad \ + xmlreader/source/span \ + xmlreader/source/xmlreader \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xmlreader/Makefile b/xmlreader/Makefile new file mode 100644 index 000000000..90947b2e5 --- /dev/null +++ b/xmlreader/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# 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/xmlreader/Module_xmlreader.mk b/xmlreader/Module_xmlreader.mk new file mode 100644 index 000000000..096001e8f --- /dev/null +++ b/xmlreader/Module_xmlreader.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,xmlreader)) + +$(eval $(call gb_Module_add_targets,xmlreader,\ + Library_xmlreader \ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xmlreader/Package_inc.mk b/xmlreader/Package_inc.mk new file mode 100644 index 000000000..54a4a6947 --- /dev/null +++ b/xmlreader/Package_inc.mk @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,xmlreader_inc,$(SRCDIR)/xmlreader/inc)) +$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/pad.hxx,xmlreader/pad.hxx)) +$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/span.hxx,xmlreader/span.hxx)) +$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/xmlreader.hxx,xmlreader/xmlreader.hxx)) +$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/detail/xmlreaderdllapi.hxx,xmlreader/detail/xmlreaderdllapi.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/xmlreader/inc/makefile.mk b/xmlreader/inc/makefile.mk deleted file mode 100644 index 9f8443470..000000000 --- a/xmlreader/inc/makefile.mk +++ /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 -# -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ - -PRJ = .. -PRJNAME = xmlreader -TARGET = inc - -ENABLE_EXCEPTIONS = TRUE -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk -.INCLUDE: target.mk - -.IF "$(ENABLE_PCH)" != "" -ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch -.ENDIF diff --git a/xmlreader/inc/pch/precompiled_xmlreader.cxx b/xmlreader/inc/pch/precompiled_xmlreader.cxx deleted file mode 100644 index e5d584855..000000000 --- a/xmlreader/inc/pch/precompiled_xmlreader.cxx +++ /dev/null @@ -1,28 +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 -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#include "precompiled_xmlreader.hxx" diff --git a/xmlreader/inc/pch/precompiled_xmlreader.hxx b/xmlreader/inc/pch/precompiled_xmlreader.hxx deleted file mode 100644 index 7561fe89f..000000000 --- a/xmlreader/inc/pch/precompiled_xmlreader.hxx +++ /dev/null @@ -1,32 +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 -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -#if defined PRECOMPILED_HEADERS - -#include "sal/config.h" - -#endif diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst index fcb99bd30..e69de29bb 100755 --- a/xmlreader/prj/d.lst +++ b/xmlreader/prj/d.lst @@ -1,10 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\xmlreader -mkdir: %_DEST%\inc%_EXT%\xmlreader\detail -..\%__SRC%\bin\xmlreader.dll %_DEST%\bin%_EXT%\xmlreader.dll -..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib -..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib%_EXT%\libxmlreader.dylib -..\%__SRC%\lib\libxmlreader.so %_DEST%\lib%_EXT%\libxmlreader.so -..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc%_EXT%\xmlreader\detail\xmlreaderdllapi.hxx -..\inc\xmlreader\pad.hxx %_DEST%\inc%_EXT%\xmlreader\pad.hxx -..\inc\xmlreader\span.hxx %_DEST%\inc%_EXT%\xmlreader\span.hxx -..\inc\xmlreader\xmlreader.hxx %_DEST%\inc%_EXT%\xmlreader\xmlreader.hxx diff --git a/xmlreader/prj/makefile.mk b/xmlreader/prj/makefile.mk new file mode 100644 index 000000000..88cd9dfe0 --- /dev/null +++ b/xmlreader/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 +# +# 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/xmlreader/source/makefile.mk b/xmlreader/source/makefile.mk deleted file mode 100644 index cb71e21a1..000000000 --- a/xmlreader/source/makefile.mk +++ /dev/null @@ -1,53 +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 -# -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ - -PRJ = .. -PRJNAME = xmlreader -TARGET = xmlreader - -ENABLE_EXCEPTIONS = TRUE -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk - -CDEFS += -DOOO_DLLIMPLEMENTATION_XMLREADER - -SLOFILES = \ - $(SLO)/pad.obj \ - $(SLO)/span.obj \ - $(SLO)/xmlreader.obj - -SHL1IMPLIB = i$(SHL1TARGET) -SHL1OBJS = $(SLOFILES) -SHL1RPATH = URELIB -SHL1STDLIBS = \ - $(SALLIB) -SHL1TARGET = xmlreader -SHL1USE_EXPORTS = name -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk diff --git a/xmlreader/source/pad.cxx b/xmlreader/source/pad.cxx index b1673c4a4..8932ee382 100644 --- a/xmlreader/source/pad.cxx +++ b/xmlreader/source/pad.cxx @@ -25,9 +25,7 @@ * ************************************************************************/ -#include "precompiled_xmlreader.hxx" #include "sal/config.h" - #include "osl/diagnose.h" #include "rtl/string.h" #include "sal/types.h" diff --git a/xmlreader/source/span.cxx b/xmlreader/source/span.cxx index 3b936553b..5adfa0597 100644 --- a/xmlreader/source/span.cxx +++ b/xmlreader/source/span.cxx @@ -25,9 +25,7 @@ * ************************************************************************/ -#include "precompiled_xmlreader.hxx" #include "sal/config.h" - #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "osl/diagnose.h" diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 27350a8f0..234eb71cb 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -25,7 +25,6 @@ * ************************************************************************/ -#include "precompiled_xmlreader.hxx" #include "sal/config.h" #include -- cgit v1.2.3 From dc6d93349f751a1e3805be2fd9c9e6289fffdbbf Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 14 Mar 2011 15:09:15 +0100 Subject: gnumake4: xmlreader: fix build.lst [hg:ab8134c0d177] --- xmlreader/prj/build.lst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmlreader/prj/build.lst b/xmlreader/prj/build.lst index 5408a5255..7c37df8a7 100644 --- a/xmlreader/prj/build.lst +++ b/xmlreader/prj/build.lst @@ -1,3 +1,2 @@ xr xmlreader : BOOST:boost cppu offuh sal stlport NULL -xr xmlreader\inc nmake - all xr_inc NULL -xr xmlreader\source nmake - all xr_source xr_inc NULL +xr xmlreader\prj nmake - all xr_prj NULL -- cgit v1.2.3 From 247bf82a4fc458bbe43a803fb2c8a0561d67af2e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 13 Apr 2011 16:11:41 +0000 Subject: gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd] --- xmlreader/Library_xmlreader.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index f7ad24377..96ac40326 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,xmlreader,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,xmlreader,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,xmlreader,\ -DOOO_DLLIMPLEMENTATION_XMLREADER \ )) -- cgit v1.2.3 From ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 18 Jun 2011 14:12:17 +0200 Subject: fixing rebase errors --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 120000 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 120000 index 000000000..f18402b73 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes \ No newline at end of file -- cgit v1.2.3 From c5235330a83081e6b744d93996f37b3abd6ac30a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 20 Jun 2011 13:24:15 +0200 Subject: gnumake4: fix buildbreakers from merge --- xmlreader/Library_xmlreader.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 96ac40326..6d2de9479 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,xmlreader,\ $(eval $(call gb_Library_add_linked_libs,xmlreader,\ sal \ - stl \ $(gb_STDLIBS) \ )) -- cgit v1.2.3 From a0b0b120a588509b5c90f7fafbb13ed2a007a2c0 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 22 Jul 2011 21:05:27 +0200 Subject: postmerge fixes for gnumake4 --- offapi/prj/build.lst | 2 +- udkapi/prj/build.lst | 1 - xmlreader/Library_xmlreader.mk | 11 +++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst index 6a8001b43..22cd4e591 100644 --- a/offapi/prj/build.lst +++ b/offapi/prj/build.lst @@ -1,2 +1,2 @@ oa offapi : udkapi DESKTOP:idlc solenv NULL -oa offapi/prj nmake - all oa_mkout NULL +oa offapi/prj nmake - all oa_prj NULL diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst index b51f2a247..5b763130c 100644 --- a/udkapi/prj/build.lst +++ b/udkapi/prj/build.lst @@ -1,3 +1,2 @@ ua udkapi : DESKTOP:idlc DESKTOP:codemaker NULL -ua udkapi usr1 - all ua_mkout NULL ua udkapi\prj nmake - all ua_prj NULL diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index 6d2de9479..807af424e 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -29,12 +29,6 @@ $(eval $(call gb_Library_Library,xmlreader)) $(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc)) -# add any additional include paths for this library here -$(eval $(call gb_Library_set_include,xmlreader,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -)) - $(eval $(call gb_Library_add_defs,xmlreader,\ -DOOO_DLLIMPLEMENTATION_XMLREADER \ )) @@ -50,4 +44,9 @@ $(eval $(call gb_Library_add_exception_objects,xmlreader,\ xmlreader/source/xmlreader \ )) +$(eval $(call gb_Library_add_api,xmlreader,\ + offapi \ + udkapi \ +)) + # vim: set noet sw=4 ts=4: -- cgit v1.2.3