Makefile.in | 1 RepositoryExternal.mk | 69 ++++++++++++++++++++++++++----- basctl/AllLangResTarget_basctl.mk | 5 -- config_host.mk.in | 2 configure.ac | 22 +++------ dbaccess/AllLangResTarget_dbu.mk | 5 -- fontconfig/ExternalPackage_fontconfig.mk | 6 -- freetype/ExternalPackage_freetype.mk | 57 ------------------------- libcdr/ExternalPackage_libcdr.mk | 7 --- libodfgen/ExternalPackage_libodfgen.mk | 7 --- libwpg/ExternalPackage_libwpg.mk | 6 -- libwpg/UnpackedTarball_libwpg.mk | 7 +++ libwps/ExternalPackage_libwps.mk | 5 -- libwps/UnpackedTarball_libwps.mk | 7 +++ redland/ExternalProject_raptor.mk | 2 redland/ExternalProject_redland.mk | 3 - reportdesign/AllLangResTarget_rpt.mk | 5 -- reportdesign/AllLangResTarget_rptui.mk | 5 -- sc/AllLangResTarget_sc.mk | 5 -- sd/AllLangResTarget_sd.mk | 5 -- solenv/gbuild/AllLangResTarget.mk | 2 solenv/gbuild/Executable.mk | 2 solenv/gbuild/Library.mk | 2 solenv/gbuild/Module.mk | 3 - solenv/gbuild/Package.mk | 3 - solenv/gbuild/Postprocess.mk | 16 +++++++ solenv/gbuild/TargetLocations.mk | 3 - solenv/gbuild/UIConfig.mk | 2 solenv/gbuild/gbuild.mk | 2 starmath/AllLangResTarget_sm.mk | 5 -- svx/Module_svx.mk | 1 svx/Package_globlmn_hrc.mk | 14 ------ sw/AllLangResTarget_sw.mk | 5 -- vcl/Library_vclplug_svp.mk | 5 -- vcl/StaticLibrary_headless.mk | 34 ++++++++------- 35 files changed, 138 insertions(+), 192 deletions(-)
New commits: commit 07e1da75a4ee94910ceb5e72d8ff20ac52a51a8d Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 15:16:58 2013 +0200 kill and bury $(OUTDIR)/inc Change-Id: Ifaac9bd368cb62abba5ebea315939c91856d0ee0 diff --git a/configure.ac b/configure.ac index a7eaa93..4f422ee 100644 --- a/configure.ac +++ b/configure.ac @@ -3964,7 +3964,7 @@ else INSTDIR=${BUILDDIR}/instdir/${INPATH} fi OUTDIR="${SOLARVER}/${INPATH}" -SOLARINC="-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc $SOLARINC" +SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC" AC_SUBST(COM) AC_SUBST(CPU) AC_SUBST(CPUNAME) diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 88b8a0e..a26ec7a 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ - CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ ./configure --disable-gtk-doc \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --with-www=xml \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 8e37777..927e8f5 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -24,7 +24,6 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ - CPPFLAGS="-I$(OUTDIR)/inc/external" \ LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ PKG_CONFIG="" \ @@ -48,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ - CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 9dd059f..3ed5aa0 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -40,7 +40,6 @@ gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1) gb_PackagePart_get_destinations = \ $(INSTDIR) \ $(OUTDIR)/bin \ - $(OUTDIR)/inc \ $(OUTDIR)/lib \ $(OUTDIR)/par \ $(OUTDIR)/pck \ @@ -419,6 +418,5 @@ gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib # static variables declared here because they are used globally gb_POLOCATION := $(SRCDIR)/translations/source -gb_EXTERNAL_HEADERS_DIR := $(OUTDIR)/inc/external # vim: set noet sw=4: commit e9c48a952d189701f2ccb201dbb450891a38c39f Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 15:16:07 2013 +0200 stop delivering globlmn.hrc Change-Id: Ibcc9679b37f22fdfb6a53503b252f55a52834fbb diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 657c969..34c8dc7 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -34,11 +34,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,basctl,\ $(eval $(call gb_SrsTarget_SrsTarget,basctl/res)) -$(eval $(call gb_SrsTarget_use_packages,basctl/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,basctl/res,\ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ -I$(SRCDIR)/basctl/inc \ -I$(SRCDIR)/basctl/source/inc \ -I$(SRCDIR)/basctl/source/basicide \ diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index 646282c..084d536 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -17,15 +17,12 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbu,\ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu)) -$(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ $$(INCLUDE) \ -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \ -I$(SRCDIR)/dbaccess/inc \ -I$(SRCDIR)/dbaccess/source/ui/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk index 43b91b7..c330adf 100644 --- a/reportdesign/AllLangResTarget_rpt.mk +++ b/reportdesign/AllLangResTarget_rpt.mk @@ -17,13 +17,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,rpt,\ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res)) -$(eval $(call gb_SrsTarget_use_packages,reportdesign/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,reportdesign/res,\ $$(INCLUDE) \ -I$(SRCDIR)/reportdesign/source/core/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\ diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index a496a54..ce526ed 100644 --- a/reportdesign/AllLangResTarget_rptui.mk +++ b/reportdesign/AllLangResTarget_rptui.mk @@ -34,14 +34,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui)) $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui)) -$(eval $(call gb_SrsTarget_use_packages,reportdesign/rptui,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\ $$(INCLUDE) \ -I$(SRCDIR)/reportdesign/source/ui/inc \ -I$(SRCDIR)/reportdesign/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index dbfcd2b..9b0541a 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -16,10 +16,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sc,\ $(eval $(call gb_SrsTarget_SrsTarget,sc/res)) -$(eval $(call gb_SrsTarget_use_packages,sc/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,sc/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sc/inc \ @@ -29,6 +25,7 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\ -I$(SRCDIR)/sc/source/ui/pagedlg \ -I$(SRCDIR)/sc/source/ui/dbgui \ -I$(SRCDIR)/sc/source/ui/formdlg \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,sc/res,\ diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 0e59384..28e3b94 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -17,16 +17,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,sd,\ $(eval $(call gb_SrsTarget_SrsTarget,sd/res)) -$(eval $(call gb_SrsTarget_use_packages,sd/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,sd/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sd/inc \ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \ -I$(call gb_SrsTemplateTarget_get_include_dir,sd) \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,sd/res,\ diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 90c684d..40025ab 100644 --- a/starmath/AllLangResTarget_sm.mk +++ b/starmath/AllLangResTarget_sm.mk @@ -20,13 +20,10 @@ $(eval $(call gb_SrsTarget_SrsTarget,sm/res)) $(eval $(call gb_SrsTarget_set_include,sm/res,\ -I$(SRCDIR)/starmath/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ $$(INCLUDE) \ )) -$(eval $(call gb_SrsTarget_use_packages,sm/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_add_files,sm/res,\ starmath/source/smres.src \ starmath/source/commands.src \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 9a08fc4..dce20c0 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,svx,\ AllLangResTarget_ofa \ AllLangResTarget_gal \ AllLangResTarget_textconversiondlgs \ - Package_globlmn_hrc \ UIConfig_svx \ )) diff --git a/svx/Package_globlmn_hrc.mk b/svx/Package_globlmn_hrc.mk deleted file mode 100644 index 77b3787..0000000 --- a/svx/Package_globlmn_hrc.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,svx_globlmn_hrc,$(call gb_SrsTemplateTarget_get_include_dir,svx))) - -$(eval $(call gb_Package_add_file,svx_globlmn_hrc,inc/svx/globlmn.hrc,globlmn.hrc)) - -# vim:set noet sw=4 ts=4: diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 4aa005c..bfb95fc 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -25,10 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sw,\ $(eval $(call gb_SrsTarget_SrsTarget,sw/res)) -$(eval $(call gb_SrsTarget_use_packages,sw/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,sw/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sw/inc \ @@ -57,6 +53,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ -I$(SRCDIR)/sw/source/ui/utlui \ -I$(SRCDIR)/sw/source/ui/web \ -I$(SRCDIR)/sw/source/ui/wrtsh \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,sw/res,\ commit 6f9d8211a13c51019835c62043193c0573e525b2 Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 14:58:31 2013 +0200 stop delivering libwps headers Yes, I am impatient .-) Change-Id: Ic3a51ffc0a151e8ae71f8d2ff067ea4c3ad1c6b2 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1e45da6..95a5012 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1632,6 +1632,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wps +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libwps)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libwps \ ) diff --git a/configure.ac b/configure.ac index 9815977..a7eaa93 100644 --- a/configure.ac +++ b/configure.ac @@ -7277,7 +7277,7 @@ AC_SUBST([SYSTEM_FREETYPE]) dnl =================================================================== dnl Check for system libwps dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpslib"]) +libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${WORKDIR}/UnpackedTarball/libwps/inc"],["-L${OUTDIR}/lib -lwpslib"]) dnl =================================================================== dnl Check for system libwpg diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk index 995ec7c..960ae1b 100644 --- a/libwps/ExternalPackage_libwps.mk +++ b/libwps/ExternalPackage_libwps.mk @@ -9,11 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\ - src/lib/libwps.h \ - src/lib/WPSDocument.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps)) ifeq ($(OS)$(COM),WNTMSC) diff --git a/libwps/UnpackedTarball_libwps.mk b/libwps/UnpackedTarball_libwps.mk index 1fd633a..7c31bf8 100644 --- a/libwps/UnpackedTarball_libwps.mk +++ b/libwps/UnpackedTarball_libwps.mk @@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps)) $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) +# HACK to avoid the need to deliver the headers to $(OUTDIR). This +# should be removed when libwps is updated. +$(eval $(call gb_UnpackedTarball_set_post_action,libwps,\ + mkdir -p inc/libwps && \ + cp -f src/lib/libwps.h src/lib/WPSDocument.h inc/libwps \ +)) + # vim: set noet sw=4 ts=4: commit c51a2542f52f99488f31beb90067586af3075b5b Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 14:53:37 2013 +0200 do not deliver libwpg headers Yes, I am impatient .-) Change-Id: I3d9c292b0d86bc1dd40a574272a43d8178f3a3b3 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3ce5a41..1e45da6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1593,6 +1593,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpg +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libwpg \ ) diff --git a/configure.ac b/configure.ac index 1307e5a..9815977 100644 --- a/configure.ac +++ b/configure.ac @@ -7282,7 +7282,7 @@ libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external" dnl =================================================================== dnl Check for system libwpg dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpglib"]) +libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${WORKDIR}/UnpackedTarball/libwpg/inc"],["-L${OUTDIR}/lib -lwpglib"]) # =================================================================== # Check for system libxslt diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk index 927f2da..b804836 100644 --- a/libwpg/ExternalPackage_libwpg.mk +++ b/libwpg/ExternalPackage_libwpg.mk @@ -9,12 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg,inc/external/libwpg,\ - src/lib/libwpg.h \ - src/lib/WPGPaintInterface.h \ - src/lib/WPGraphics.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libwpg,libwpg)) ifeq ($(OS)$(COM),WNTMSC) diff --git a/libwpg/UnpackedTarball_libwpg.mk b/libwpg/UnpackedTarball_libwpg.mk index 03be206..7c76a95 100644 --- a/libwpg/UnpackedTarball_libwpg.mk +++ b/libwpg/UnpackedTarball_libwpg.mk @@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg)) $(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL))) +# HACK to avoid the need to deliver the headers to $(OUTDIR). This +# should be removed when libwpg is updated. +$(eval $(call gb_UnpackedTarball_set_post_action,libwpg,\ + mkdir -p inc/libwpg && \ + cp -f src/lib/libwpg.h src/lib/WPGPaintInterface.h src/lib/WPGraphics.h inc/libwpg \ +)) + # vim: set noet sw=4 ts=4: commit 87a22d6a2371d8b58f96a6a9cf23c1063ce383d7 Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 14:36:44 2013 +0200 add missing modelines Change-Id: I84028e254ed1bea71321da11be2027577ce4fa85 diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index b09dad7..a64d9d4 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # @@ -9,26 +10,28 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) $(eval $(call gb_StaticLibrary_use_externals,headless,\ - boost_headers \ - freetype_headers \ + boost_headers \ + freetype_headers \ )) $(eval $(call gb_StaticLibrary_use_api,headless,\ - offapi \ - udkapi \ + offapi \ + udkapi \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,headless,\ - vcl/headless/svpbmp \ - vcl/headless/svpdummies \ - vcl/headless/svpelement \ - vcl/headless/svpframe \ - vcl/headless/svpprn \ - vcl/headless/svptext \ - vcl/headless/svpvd \ + vcl/headless/svpbmp \ + vcl/headless/svpdummies \ + vcl/headless/svpelement \ + vcl/headless/svpframe \ + vcl/headless/svpprn \ + vcl/headless/svptext \ + vcl/headless/svpvd \ )) $(eval $(call gb_StaticLibrary_set_include,headless,\ - $$(INCLUDE) \ - -I$(SRCDIR)/vcl/inc \ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ )) + +# vim: set noet sw=4 ts=4: commit 962771f7d5c353fa861fce4b5a3a612a1d76bca5 Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 14:35:18 2013 +0200 stop delivering freetype headers Change-Id: I8e14cc411520272969cfd24048e403b9fd53cde4 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4a2ac5d..3ce5a41 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -994,13 +994,12 @@ endif # SYSTEM_REDLAND ifeq ($(SYSTEM_CAIRO),YES) -# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used define gb_LinkTarget__use_cairo $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(FREETYPE_CFLAGS) \ $(CAIRO_CFLAGS) \ ) +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS)) endef @@ -1017,10 +1016,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ define gb_LinkTarget__use_cairo $(call gb_LinkTarget_use_package,$(1),cairo) $(call gb_LinkTarget_use_package,$(1),pixman) +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cairo) \ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ - $(FREETYPE_CFLAGS) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -1034,20 +1033,38 @@ endef endif # SYSTEM_CAIRO -define gb_LinkTarget__use_freetype +ifeq ($(SYSTEM_FREETYPE),YES) + +define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(FREETYPE_CFLAGS) \ ) -ifneq ($(OS),ANDROID) +endef + +define gb_LinkTarget__use_freetype +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) -else + +endef + +else # ! SYSTEM_FREETYPE + +define gb_LinkTarget__use_freetype_headers +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ + $$(INCLUDE) \ +) + +define gb_LinkTarget__use_freetype +$(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_use_static_libraries,$(1),freetype) -endif endef +endif # SYSTEM_FREETYPE + ifeq ($(SYSTEM_FONTCONFIG),YES) define gb_LinkTarget__use_fontconfig diff --git a/config_host.mk.in b/config_host.mk.in index f06a5d9..76df377 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -460,6 +460,7 @@ export SYSTEM_CURL=@SYSTEM_CURL@ export SYSTEM_DICTS=@SYSTEM_DICTS@ export SYSTEM_EXPAT=@SYSTEM_EXPAT@ export SYSTEM_FONTCONFIG=@SYSTEM_FONTCONFIG@ +export SYSTEM_FREETYPE=@SYSTEM_FREETYPE@ export SYSTEM_GENBRK=@SYSTEM_GENBRK@ export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@ export SYSTEM_GENCMN=@SYSTEM_GENCMN@ diff --git a/configure.ac b/configure.ac index 35b2aad..1307e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -7268,15 +7268,11 @@ if test "$test_freetype" = "yes"; then # 9.4.3 is 2.1.5; the first FreeType release to provide a freetype2.pc file # XXX: replace this with a real minimum required version PKG_CHECK_MODULES( FREETYPE, freetype2 >= 9.4.3 ) -else - case "$BUILD_TYPE" in - *FREETYPE*) - FREETYPE_LIBS="-lfreetype" - ;; - esac + SYSTEM_FREETYPE=YES fi AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) +AC_SUBST([SYSTEM_FREETYPE]) dnl =================================================================== dnl Check for system libwps diff --git a/freetype/ExternalPackage_freetype.mk b/freetype/ExternalPackage_freetype.mk index 0c90165..87067ad 100644 --- a/freetype/ExternalPackage_freetype.mk +++ b/freetype/ExternalPackage_freetype.mk @@ -11,63 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype)) $(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,freetype,inc/external,\ - include/ft2build.h \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,freetype,inc/external/freetype,\ - include/freetype/freetype.h \ - include/freetype/ftadvanc.h \ - include/freetype/ftbbox.h \ - include/freetype/ftbdf.h \ - include/freetype/ftbitmap.h \ - include/freetype/ftbzip2.h \ - include/freetype/ftcache.h \ - include/freetype/ftchapters.h \ - include/freetype/ftcid.h \ - include/freetype/fterrdef.h \ - include/freetype/fterrors.h \ - include/freetype/ftgasp.h \ - include/freetype/ftglyph.h \ - include/freetype/ftgxval.h \ - include/freetype/ftgzip.h \ - include/freetype/ftimage.h \ - include/freetype/ftincrem.h \ - include/freetype/ftlcdfil.h \ - include/freetype/ftlist.h \ - include/freetype/ftlzw.h \ - include/freetype/ftmac.h \ - include/freetype/ftmm.h \ - include/freetype/ftmodapi.h \ - include/freetype/ftmoderr.h \ - include/freetype/ftotval.h \ - include/freetype/ftoutln.h \ - include/freetype/ftpfr.h \ - include/freetype/ftrender.h \ - include/freetype/ftsizes.h \ - include/freetype/ftsnames.h \ - include/freetype/ftstroke.h \ - include/freetype/ftsynth.h \ - include/freetype/ftsystem.h \ - include/freetype/fttrigon.h \ - include/freetype/fttypes.h \ - include/freetype/ftwinfnt.h \ - include/freetype/ftxf86.h \ - include/freetype/t1tables.h \ - include/freetype/ttnameid.h \ - include/freetype/tttables.h \ - include/freetype/tttags.h \ - include/freetype/ttunpat.h \ -)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,freetype,inc/external/freetype/config,\ - include/freetype/config/ftconfig.h \ - include/freetype/config/ftheader.h \ - include/freetype/config/ftmodule.h \ - include/freetype/config/ftoption.h \ - include/freetype/config/ftstdlib.h \ -)) - $(eval $(call gb_ExternalPackage_add_files,freetype,lib,\ objs/.libs/libfreetype.a \ )) diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 32e88dd..e465c85 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -24,10 +24,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\ -I$(SRCDIR)/vcl/inc \ )) -$(eval $(call gb_Library_add_cxxflags,vclplug_svp,\ - $$(FREETYPE_CFLAGS) \ -)) - $(eval $(call gb_Library_add_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) @@ -54,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ $(eval $(call gb_Library_use_externals,vclplug_svp,\ boost_headers \ + freetype_headers \ icule \ icuuc \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index 6d179b6..b09dad7 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -8,17 +8,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) -$(eval $(call gb_StaticLibrary_use_external,headless,boost_headers)) +$(eval $(call gb_StaticLibrary_use_externals,headless,\ + boost_headers \ + freetype_headers \ +)) $(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ )) -$(eval $(call gb_StaticLibrary_add_cxxflags,headless,\ - $$(FREETYPE_CFLAGS) \ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,headless,\ vcl/headless/svpbmp \ vcl/headless/svpdummies \ commit 4eb68428f676121340bb1533742635f28081e26a Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 14:16:03 2013 +0200 stop delivering fontconfig headers Change-Id: Idb11e26ddf19c5424b838586dbd1d8d34a93cf23 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0ae508d..4a2ac5d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1048,20 +1048,36 @@ endif endef +ifeq ($(SYSTEM_FONTCONFIG),YES) + define gb_LinkTarget__use_fontconfig $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(FONTCONFIG_CFLAGS) \ ) -ifneq ($(OS),ANDROID) $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) -else + +endef + +else # ! SYSTEM_FONTCONFIG + +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + fontconfig \ +)) + +define gb_LinkTarget__use_fontconfig +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ + $$(INCLUDE) \ +) + $(call gb_LinkTarget_use_static_libraries,$(1),fontconfig) -endif endef +endif # SYSTEM_FONTCONFIG + ifeq ($(SYSTEM_GRAPHITE),YES) define gb_LinkTarget__use_graphite diff --git a/config_host.mk.in b/config_host.mk.in index fa85877..f06a5d9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -459,6 +459,7 @@ export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@ export SYSTEM_CURL=@SYSTEM_CURL@ export SYSTEM_DICTS=@SYSTEM_DICTS@ export SYSTEM_EXPAT=@SYSTEM_EXPAT@ +export SYSTEM_FONTCONFIG=@SYSTEM_FONTCONFIG@ export SYSTEM_GENBRK=@SYSTEM_GENBRK@ export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@ export SYSTEM_GENCMN=@SYSTEM_GENCMN@ diff --git a/configure.ac b/configure.ac index bb603a9..35b2aad 100644 --- a/configure.ac +++ b/configure.ac @@ -4341,15 +4341,11 @@ AC_SUBST(ENABLE_CUPS) # fontconfig checks if test "$test_fontconfig" = "yes"; then PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0]) -else - case "$BUILD_TYPE" in - *FONTCONFIG*) - FONTCONFIG_LIBS="-lfontconfig" - ;; - esac + SYSTEM_FONTCONFIG=YES fi AC_SUBST(FONTCONFIG_CFLAGS) AC_SUBST(FONTCONFIG_LIBS) +AC_SUBST([SYSTEM_FONTCONFIG]) dnl whether to find & fetch external tarballs? dnl =================================================================== diff --git a/fontconfig/ExternalPackage_fontconfig.mk b/fontconfig/ExternalPackage_fontconfig.mk index 7f074e8..bee7f01 100644 --- a/fontconfig/ExternalPackage_fontconfig.mk +++ b/fontconfig/ExternalPackage_fontconfig.mk @@ -11,12 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fontconfig,fontconfig)) $(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fontconfig,inc/fontconfig,\ - fontconfig/fcfreetype.h \ - fontconfig/fcprivate.h \ - fontconfig/fontconfig.h \ -)) - $(eval $(call gb_ExternalPackage_add_files,fontconfig,lib,\ src/.libs/libfontconfig.a \ )) commit 0f8a90cff1106e5df7d56d9677e547b84d52cfe8 Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 13:49:11 2013 +0200 stop delivering libodfgen headers Change-Id: I6402ef93bec9bf996089dcef702081b9853b9a0c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1e16b2a..0ae508d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1418,6 +1418,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_odfgen +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libodfgen \ ) diff --git a/libodfgen/ExternalPackage_libodfgen.mk b/libodfgen/ExternalPackage_libodfgen.mk index bfa163f..ad7a3d1 100644 --- a/libodfgen/ExternalPackage_libodfgen.mk +++ b/libodfgen/ExternalPackage_libodfgen.mk @@ -9,13 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libodfgen,inc/external/libodfgen,\ - inc/libodfgen/libodfgen.hxx \ - inc/libodfgen/OdfDocumentHandler.hxx \ - inc/libodfgen/OdtGenerator.hxx \ - inc/libodfgen/OdgGenerator.hxx \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen)) ifeq ($(COM),MSC) commit f16f36680267821d6fdf1cb309a5004a4eee515b Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 13:48:03 2013 +0200 stop delivering libcdr headers Change-Id: I2baf55f41bc4f2fa934db3580103cebaeb60155c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0be2054..1e16b2a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1384,6 +1384,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_cdr +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libcdr)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libcdr \ ) diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index d612a77..908ce60 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -9,13 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ - inc/libcdr/libcdr.h \ - inc/libcdr/CDRDocument.h \ - inc/libcdr/CDRStringVector.h \ - inc/libcdr/CMXDocument.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) ifeq ($(COM),MSC) commit df7b8637051250b09e1d80c29b563022b64822a2 Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 15:49:11 2013 +0200 gbuild: allow to call Postprocess targets from top level Change-Id: Id2755144f5942b4aeaaca8ef6dad0fcb11ddf76a diff --git a/Makefile.in b/Makefile.in index 26a00ad..f746fe3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,6 +119,7 @@ gbuild_TARGETS := AllLangHelp \ Package \ PackageSet \ Pagein \ + Postprocess \ Pyuno \ PythonTest \ Rdb \ diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 7e6eec0..2e08cb1 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -14,17 +14,27 @@ $(call gb_Postprocess_get_target,%) : $(call gb_Output_announce,$(POSTPROCESS_INFO): $(if $(POSTPROCESS_PREFIX),$(subst $(POSTPROCESS_PREFIX),,$^),$^),$(true),ALL) touch $@ +.PHONY : $(call gb_Postprocess_get_clean_target,%) +$(call gb_Postprocess_get_clean_target,%) : + $(call gb_Output_announce,$(POSTPROCESS_INFO): $(if $(POSTPROCESS_PREFIX),$(subst $(POSTPROCESS_PREFIX),,$^),$^),$(false),ALL) + rm -f $(call gb_Postprocess_get_target,$*) + define gb_Postprocess_Postprocess $(call gb_Postprocess_get_target,$(1)) : POSTPROCESS_INFO := $(2) $(call gb_Postprocess_get_target,$(1)) : POSTPROCESS_PREFIX := $(3) +$(call gb_Postprocess_get_clean_target,$(1)) : POSTPROCESS_INFO := $(2) +$(call gb_Postprocess_get_clean_target,$(1)) : POSTPROCESS_PREFIX := $(subst $(WORKDIR),$(WORKDIR)/Clean,$(3)) $(call gb_Postprocess_get_target,$(1)) :| $(dir $(call gb_Postprocess_get_target,$(1))).dir +$(call gb_Helper_make_userfriendly_targets,$(1),Postprocess) + endef # gb_Postprocess_register_target category class targetname define gb_Postprocess_register_target $(call gb_Postprocess_get_target,$(1)) : $(call gb_$(2)_get_target,$(3)) +$(call gb_Postprocess_get_clean_target,$(1)) : $(call gb_$(2)_get_clean_target,$(3)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 6246eb3..9dd059f 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -299,6 +299,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ Package \ PackageSet \ Pagein \ + Postprocess \ PrecompiledHeader \ PropertiesTranslateTarget \ Pyuno \ commit f546f4fc968bcbd490159e2c80bf04a95a35df49 Author: David Tardon <dtar...@redhat.com> Date: Fri May 24 15:47:38 2013 +0200 gbuild: simplify reg. of targets for Postprocess Change-Id: Id184df89c5c15c55e42f376ed06c83174c486f67 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index cb22a46a..37262d2 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -454,7 +454,6 @@ $(call gb_AllLangResTarget_get_target,%) : mkdir -p $(dir $@) && touch $@) define gb_AllLangResTarget_AllLangResTarget -$(call gb_Postprocess_get_target,AllResources) : $(call gb_AllLangResTarget_get_target,$(1)) $(foreach lang,$(gb_AllLangResTarget_LANGS),\ $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang))) @@ -471,6 +470,7 @@ endif $$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget) +$(call gb_Postprocess_register_target,AllResources,AllLangResTarget,$(1)) endef diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index d2d6b41..b3e5fb8 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -58,7 +58,7 @@ gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Exec gb_Executable__get_instdir = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1))) define gb_Executable_Executable -$(call gb_Postprocess_get_target,AllExecutables) : $(call gb_Executable_get_target,$(1)) +$(call gb_Postprocess_register_target,AllExecutables,Executable,$(1)) ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN))) $$(eval $$(call gb_Output_info,Currently known executables: $(sort $(gb_Executable_KNOWN)),ALL)) $$(eval $$(call gb_Output_error,Executable $(1) must be registered in Repository.mk)) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index cee2d67..918898d 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -58,7 +58,7 @@ gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1))) define gb_Library_Library -$(call gb_Postprocess_get_target,AllLibraries) : $(call gb_Library_get_target,$(1)) +$(call gb_Postprocess_register_target,AllLibraries,Library,$(1)) ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS))) $$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk)) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index e451563..4b859ce 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -167,7 +167,6 @@ gb_Module__debug_enabled = \ $(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR))) define gb_Module_Module -$(if $(filter-out libreoffice instsetoo_native android ios,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1))) gb_Module_ALLMODULES += $(1) gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST)))) gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK) @@ -178,6 +177,8 @@ gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Modul gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1)) gb_Module_CURRENTMODULE_NAME := $(1) $(call gb_Helper_make_userfriendly_targets,$(1),Module) +$(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\ + $(call gb_Postprocess_register_target,AllModulesButInstsetNative,Module,$(1))) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index dc5b441..63da386 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -100,7 +100,8 @@ $(call gb_Package_get_target,$(1)) :| $(dir $(call gb_Package_get_target,$(1))). endef define gb_Package_Package -$(if $(filter postprocess% instsetoo_native%,$(1)),,$(call gb_Postprocess_get_target,AllPackages) : $(call gb_Package_get_target,$(1))) +$(if $(filter postprocess% instsetoo_native%,$(1)),,\ + $(call gb_Postprocess_register_target,AllPackages,Package,$(1))) $(call gb_Package_Package_internal,$(1),$(2)) $$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),Package) diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 972a795..7e6eec0 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -22,6 +22,12 @@ $(call gb_Postprocess_get_target,$(1)) :| $(dir $(call gb_Postprocess_get_target endef +# gb_Postprocess_register_target category class targetname +define gb_Postprocess_register_target +$(call gb_Postprocess_get_target,$(1)) : $(call gb_$(2)_get_target,$(3)) + +endef + define gb_Postprocess_make_targets $(call gb_Postprocess_Postprocess,AllExecutables,All executables) $(call gb_Postprocess_Postprocess,AllLibraries,All libraries) diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 52cffe5..82ff5a7 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -216,7 +216,6 @@ $(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(c $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir $(call gb_UIConfig_get_imagelist_target,$(1)) :| $(dir $(call gb_UIConfig_get_imagelist_target,$(1))).dir $(call gb_UIConfig_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call gb_UIConfig_get_packagesetname,$(1))) -$(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1)) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_PackageSet_get_clean_target,$(call gb_UIConfig_get_packagesetname,$(1))) ifneq ($(gb_UIConfig_LANGS),) @@ -225,6 +224,7 @@ endif $$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),UIConfig) +$(call gb_Postprocess_register_target,AllUIConfigs,UIConfig,$(1)) endef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 866434d..f2647ee 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -302,6 +302,7 @@ $(eval $(call gb_Deliver_init)) include $(foreach class, \ ComponentTarget \ + Postprocess \ AllLangResTarget \ WinResTarget \ LinkTarget \ @@ -345,7 +346,6 @@ include $(foreach class, \ InstallModule \ InstallScript \ AutoInstallLibs \ - Postprocess \ PackageSet \ GeneratedPackage \ ,$(GBUILDDIR)/$(class).mk) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits