strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)

Browse source 
…by a simple/static $(gb_UnpackedTarball_workdir)/foo
see also 0c4c84a14b

Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
This commit is contained in:
Christian Lohmaier 2024-05-05 19:20:33 +02:00
parent 971db10d73
commit 875a1bf2e1
79 changed files with 458 additions and 457 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

380
RepositoryExternal.mk
View file

File diff suppressed because it is too large Load diff

2
external/IAccessible2/ExternalProject_IAccessible2.mk vendored
View file

@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,IAccessible2,\
$(call gb_ExternalProject_get_state_target,IAccessible2,build) :
$(call gb_Trace_StartRange,IAccessible2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cd $(call gb_UnpackedTarball_get_dir,IAccessible2)\
cd $(gb_UnpackedTarball_workdir)/IAccessible2\
&& ./concatidl.sh\
)
$(call gb_Trace_EndRange,IAccessible2,EXTERNAL)

4
external/argon2/ExternalProject_argon2.mk vendored
View file

@ -22,12 +22,12 @@ $(call gb_ExternalProject_get_state_target,argon2,build):
$(call gb_Trace_StartRange,argon2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
MSBuild.exe vs2015/Argon2OptDll/Argon2OptDll.vcxproj \
/p:SolutionDir="$(call gb_UnpackedTarball_get_dir,argon2)/" \
/p:SolutionDir="$(gb_UnpackedTarball_workdir)/argon2/" \
$(gb_MSBUILD_CONFIG_AND_PLATFORM) \
/p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \
$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
&& MSBuild.exe vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj \
/p:SolutionDir="$(call gb_UnpackedTarball_get_dir,argon2)/" \
/p:SolutionDir="$(gb_UnpackedTarball_workdir)/argon2/" \
$(gb_MSBUILD_CONFIG_AND_PLATFORM) \
/p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \
$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \

2
external/boost/StaticLibrary_boost_locale.mk vendored
View file

@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boost_locale,\
))
$(eval $(call gb_StaticLibrary_set_include,boost_locale, \
-I$(call gb_UnpackedTarball_get_dir,boost)/libs/locale/src \
-I$(gb_UnpackedTarball_workdir)/boost/libs/locale/src \
$$(INCLUDE) \
))

4
external/box2d/StaticLibrary_box2d.mk vendored
View file

@ -16,8 +16,8 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,box2d))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,box2d,cpp))
$(eval $(call gb_StaticLibrary_set_include,box2d,\
-I$(call gb_UnpackedTarball_get_dir,box2d/include/)\
-I$(call gb_UnpackedTarball_get_dir,box2d/src/)\
-I$(gb_UnpackedTarball_workdir)/box2d/include/\
-I$(gb_UnpackedTarball_workdir)/box2d/src/\
$$(INCLUDE)\
))

4
external/breakpad/StaticLibrary_breakpad.mk vendored
View file

@ -14,8 +14,8 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,breakpad))
$(eval $(call gb_StaticLibrary_use_unpacked,breakpad,breakpad))
$(eval $(call gb_StaticLibrary_set_include,breakpad,\
-I$(call gb_UnpackedTarball_get_dir,breakpad)/src \
-I$(call gb_UnpackedTarball_get_dir,breakpad)/src/client/windows \
-I$(gb_UnpackedTarball_workdir)/breakpad/src \
-I$(gb_UnpackedTarball_workdir)/breakpad/src/client/windows \
$$(INCLUDE) \
))

8
external/cairo/ExternalProject_cairo.mk vendored
View file

@ -57,8 +57,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
LIBS="$(ZLIB_LIBS)" \
$(if $(filter -fsanitize=%,$(LDFLAGS)),LDFLAGS="$(LDFLAGS) -fuse-ld=bfd") \
pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman -pthread" \
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
pixman_CFLAGS="-I$(gb_UnpackedTarball_workdir)/pixman/pixman -pthread" \
pixman_LIBS="-L$(gb_UnpackedTarball_workdir)/pixman/pixman/.libs -lpixman-1 \
$(if $(filter LINUX,$(OS)),-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN) \
$(if $(filter -fsanitize=%,$(CC)), \
@ -66,8 +66,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
-Wc$(COMMA)-rtlib=compiler-rt))" \
png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(gb_UnpackedTarball_workdir)/freetype/include") \
$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(gb_UnpackedTarball_workdir)/fontconfig") \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(filter EMSCRIPTEN ANDROID iOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \

8
external/clucene/Library_clucene.mk vendored
View file

@ -16,10 +16,10 @@ $(eval $(call gb_Library_use_unpacked,clucene,clucene))
$(eval $(call gb_Library_set_warnings_disabled,clucene))
$(eval $(call gb_Library_set_include,clucene,\
-I$(call gb_UnpackedTarball_get_dir,clucene)/inc/internal \
-I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \
-I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \
-I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \
-I$(gb_UnpackedTarball_workdir)/clucene/inc/internal \
-I$(gb_UnpackedTarball_workdir)/clucene/src/core \
-I$(gb_UnpackedTarball_workdir)/clucene/src/contribs-lib \
-I$(gb_UnpackedTarball_workdir)/clucene/src/shared \
$$(INCLUDE) \
))

2
external/curl/ExternalProject_curl.mk vendored
View file

@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--disable-tftp \
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
$(if $(ENABLE_OPENSSL),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(call gb_UnpackedTarball_get_dir,openssl)"))) \
$(if $(ENABLE_OPENSSL),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(gb_UnpackedTarball_workdir)/openssl"))) \
$(if $(filter LINUX,$(OS)),--without-ca-bundle --without-ca-path) \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \

2
external/dtoa/StaticLibrary_dtoa.mk vendored
View file

@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_add_defs,dtoa,\
$(eval $(call gb_StaticLibrary_set_warnings_disabled,dtoa))
$(eval $(call gb_StaticLibrary_set_include,dtoa,\
-I$(call gb_UnpackedTarball_get_dir,dtoa/src/)\
-I$(gb_UnpackedTarball_workdir)/dtoa/src/\
$$(INCLUDE)\
))

4
external/epoxy/Library_epoxy.mk vendored
View file

@ -14,8 +14,8 @@ $(eval $(call gb_Library_use_unpacked,epoxy,epoxy))
$(eval $(call gb_Library_set_warnings_disabled,epoxy))
$(eval $(call gb_Library_set_include,epoxy,\
-I$(call gb_UnpackedTarball_get_dir,epoxy)/include \
-I$(call gb_UnpackedTarball_get_dir,epoxy)/src \
-I$(gb_UnpackedTarball_workdir)/epoxy/include \
-I$(gb_UnpackedTarball_workdir)/epoxy/src \
$$(INCLUDE) \
))

2
external/expat/StaticLibrary_expat.mk vendored
View file

@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_external_project,expat,expat,full))
endif
$(eval $(call gb_StaticLibrary_set_include,expat,\
-I$(call gb_UnpackedTarball_get_dir,expat) \
-I$(gb_UnpackedTarball_workdir)/expat \
$$(INCLUDE) \
))

2
external/expat/StaticLibrary_expat_x64.mk vendored
View file

@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,expat_x64))
$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat))
$(eval $(call gb_StaticLibrary_set_include,expat_x64,\
-I$(call gb_UnpackedTarball_get_dir,expat) \
-I$(gb_UnpackedTarball_workdir)/expat \
$$(INCLUDE) \
))

22
external/firebird/ExternalProject_firebird.mk vendored
View file

@ -32,15 +32,15 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& export CPPFLAGS=" \
$(BOOST_CPPFLAGS) \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \
-I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
-I$(gb_UnpackedTarball_workdir)/libatomic_ops/src \
) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-I$(call gb_UnpackedTarball_get_dir,libtommath) \
-I$(gb_UnpackedTarball_workdir)/libtommath \
) \
$(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/common \
-I$(gb_UnpackedTarball_workdir)/icu/source \
-I$(gb_UnpackedTarball_workdir)/icu/source/i18n \
-I$(gb_UnpackedTarball_workdir)/icu/source/common \
) \
$(if $(filter GCC-INTEL,$(COM)-$(CPUNAME)),-Di386=1) \
" \
@ -64,16 +64,16 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& export LDFLAGS=" \
$(call gb_ExternalProject_get_link_flags,firebird) \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_LIBS), \
-L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \
-L$(gb_UnpackedTarball_workdir)/libatomic_ops/src \
) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) \
-L$(gb_UnpackedTarball_workdir)/libtommath \
) \
$(if $(SYSTEM_ICU),$(ICU_LIBS), \
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
-L$(gb_UnpackedTarball_workdir)/icu/source/lib \
) \
" \
&& export LIBREOFFICE_ICU_LIB="$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& export LIBREOFFICE_ICU_LIB="$(gb_UnpackedTarball_workdir)/icu/source/lib" \
&& export MSVC_USE_INDIVIDUAL_PDBS=TRUE \
&& MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
--without-editline \
@ -87,8 +87,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(if $(HAVE_LIBCPP),CXX='$(CXX) -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR') \
&& LC_ALL=C $(MAKE) \
$(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS") \
MATHLIB="$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
MATHLIB="$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(gb_UnpackedTarball_workdir)/libtommath -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(gb_UnpackedTarball_workdir)/icu/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \
&& install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.$(firebird_VERSION) \
-delete_rpath @loader_path/.. \

2
external/fontconfig/ExternalProject_fontconfig.mk vendored
View file

@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--disable-silent-rules \
--with-pic \
$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-includes=$(gb_UnpackedTarball_workdir)/expat/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter ANDROID,$(OS)), \

2
external/freetype/ExternalProject_freetype.mk vendored
View file

@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
--without-bzip2 \
--without-harfbuzz \
--without-png \
--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
--prefix=$(gb_UnpackedTarball_workdir)/freetype/instdir \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter -fsanitize=undefined,$(CC)),CC='$(CC) -fno-sanitize=function') \
CFLAGS="$(CFLAGS) \

14
external/gpgmepp/Library_gpgmepp.mk vendored
View file

@ -22,18 +22,18 @@ $(eval $(call gb_LinkTarget_use_external_project,\
$(eval $(call gb_Library_set_warnings_disabled,gpgmepp))
$(eval $(call gb_Library_set_include,gpgmepp,\
-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/interfaces \
-I$(call gb_UnpackedTarball_get_dir,gpgmepp) \
-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/conf \
-I$(call gb_UnpackedTarball_get_dir,libgpg-error)/src \
-I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src \
-I$(gb_UnpackedTarball_workdir)/gpgmepp/lang/cpp/src/interfaces \
-I$(gb_UnpackedTarball_workdir)/gpgmepp \
-I$(gb_UnpackedTarball_workdir)/gpgmepp/src \
-I$(gb_UnpackedTarball_workdir)/gpgmepp/conf \
-I$(gb_UnpackedTarball_workdir)/libgpg-error/src \
$$(INCLUDE) \
))
$(eval $(call gb_Library_add_libs,gpgmepp,\
ws2_32.lib shell32.lib \
-LIBPATH:$(call gb_UnpackedTarball_get_dir,gpgmepp)/src/.libs libgpgme.lib \
-LIBPATH:$(gb_UnpackedTarball_workdir)/gpgmepp/src/.libs libgpgme.lib \
))
$(eval $(call gb_Library_add_defs,gpgmepp,\

4
external/graphite/StaticLibrary_graphite.mk vendored
View file

@ -14,8 +14,8 @@ $(eval $(call gb_StaticLibrary_use_unpacked,graphite,graphite))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,graphite))
$(eval $(call gb_StaticLibrary_set_include,graphite,\
-I$(call gb_UnpackedTarball_get_dir,graphite/include) \
-I$(call gb_UnpackedTarball_get_dir,graphite/src) \
-I$(gb_UnpackedTarball_workdir)/graphite/include \
-I$(gb_UnpackedTarball_workdir)/graphite/src \
$$(INCLUDE) \
))

2
external/harfbuzz/ExternalProject_harfbuzz.mk vendored
View file

@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-graphite2=yes \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
--libdir=$(call gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
--libdir=$(gb_UnpackedTarball_workdir)/harfbuzz/src/.libs \
$(gb_CONFIGURE_PLATFORMS) \
CXXFLAGS=' \
$(if $(filter ANDROID,$(OS)),-DHB_NO_MMAP=1,) \

12
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk vendored
View file

@ -25,12 +25,12 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
$(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
-Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \
-Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \
-Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \
-Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \
-Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \
-Dlibbase.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libbase/dist/libbase-$(LIBBASE_VERSION).jar \
-Dlibformula.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libformula/dist/libformula-$(LIBFORMULA_VERSION).jar \
-Dliblayout.jar=$(gb_UnpackedTarball_workdir)/jfreereport_liblayout/build/lib/liblayout.jar \
-Dlibloader.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libloader/dist/libloader-$(LIBLOADER_VERSION).jar \
-Dlibserializer.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libserializer/dist/libserializer-$(LIBBASE_VERSION).jar \
-Dlibxml.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libxml/dist/libxml-$(LIBXML_VERSION).jar \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-Dant.build.javac.target=$(JAVA_TARGET_VER) \
$(if $(debug),-Dbuild.debug="on") jar \

18
external/jfreereport/ExternalProject_jfreereport_liblayout.mk vendored
View file

@ -33,15 +33,15 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
$(if $(verbose),-v,-q) \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \
-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
-Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \
-Dlibfonts.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)/dist/libfonts-$(LIBFONTS_VERSION).jar \
-Dlibloader.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar \
-Dlibrepository.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)/dist/librepository-$(LIBREPOSITORY_VERSION).jar \
-Dlibserializer.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar \
-Dlibxml.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar \
-Dsac.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_sac)/build/lib/sac.jar \
-Dflute.jar=$(gb_UnpackedTarball_workdir)/jfreereport_flute/dist/flute-$(FLUTE_VERSION).jar \
-Dlibbase.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libbase/dist/libbase-$(LIBBASE_VERSION).jar \
-Dlibformula.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libformula/dist/libformula-$(LIBFORMULA_VERSION).jar \
-Dlibfonts.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libfonts/dist/libfonts-$(LIBFONTS_VERSION).jar \
-Dlibloader.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libloader/dist/libloader-$(LIBLOADER_VERSION).jar \
-Dlibrepository.jar=$(gb_UnpackedTarball_workdir)/jfreereport_librepository/dist/librepository-$(LIBREPOSITORY_VERSION).jar \
-Dlibserializer.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libserializer/dist/libserializer-$(LIBBASE_VERSION).jar \
-Dlibxml.jar=$(gb_UnpackedTarball_workdir)/jfreereport_libxml/dist/libxml-$(LIBXML_VERSION).jar \
-Dsac.jar=$(gb_UnpackedTarball_workdir)/jfreereport_sac/build/lib/sac.jar \
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-Dantcontrib.available="true" \

4
external/libcmis/StaticLibrary_libcmis.mk vendored
View file

@ -26,8 +26,8 @@ $(eval $(call gb_StaticLibrary_add_defs,libcmis, \
))
$(eval $(call gb_StaticLibrary_set_include,libcmis, \
-I$(call gb_UnpackedTarball_get_dir,libcmis/inc) \
-I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \
-I$(gb_UnpackedTarball_workdir)/libcmis/inc \
-I$(gb_UnpackedTarball_workdir)/libcmis/src/libcmis \
$$(INCLUDE) \
))

6
external/libetonyek/Library_etonyek.mk vendored
View file

@ -26,9 +26,9 @@ $(eval $(call gb_Library_set_warnings_disabled,etonyek))
$(eval $(call gb_Library_set_precompiled_header,etonyek,external/libetonyek/inc/pch/precompiled_etonyek))
$(eval $(call gb_Library_set_include,etonyek,\
-I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \
-I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib \
-I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/contexts \
-I$(gb_UnpackedTarball_workdir)/libetonyek/inc \
-I$(gb_UnpackedTarball_workdir)/libetonyek/src/lib \
-I$(gb_UnpackedTarball_workdir)/libetonyek/src/lib/contexts \
$$(INCLUDE) \
))

6
external/libffi/ExternalProject_libffi.mk vendored
View file

@ -37,13 +37,13 @@ $(call gb_ExternalProject_get_state_target,libffi,build):
--enable-portable-binary) \
$(if $(filter WNT,$(OS)), \
--disable-static \
CC="$(call gb_UnpackedTarball_get_dir,libffi)/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
CXX="$(call gb_UnpackedTarball_get_dir,libffi)/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
CC="$(gb_UnpackedTarball_workdir)/libffi/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
CXX="$(gb_UnpackedTarball_workdir)/libffi/msvcc.sh -m$(libffi_WIN_PLATFORM)" \
LD='link' \
CPP='cl -nologo -EP' \
CXXCPP='cl -nologo -EP' \
CPPFLAGS="-DFFI_BUILDING_DLL $(SOLARINC)") \
--prefix=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM) \
--prefix=$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM) \
--disable-docs \
&& $(MAKE) \
)

6
external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk vendored
View file

@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,libjpeg-turbo,libjpeg-turbo))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,libjpeg-turbo))
$(eval $(call gb_StaticLibrary_set_include,libjpeg-turbo,\
-I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \
-I$(gb_UnpackedTarball_workdir)/libjpeg-turbo \
$$(INCLUDE) \
))
@ -93,8 +93,8 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
ifneq ($(NASM),)
$(eval $(call gb_StaticLibrary_add_nasmflags,libjpeg-turbo,\
-I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)/simd/nasm/ \
-I$(dir $(call gb_UnpackedTarball_get_dir,libjpeg-turbo)/$(1)) \
-I$(gb_UnpackedTarball_workdir)/libjpeg-turbo/simd/nasm/ \
-I$(dir $(gb_UnpackedTarball_workdir)/libjpeg-turbo/$(1)) \
))
ifeq ($(CPUNAME),X86_64)

4
external/liblangtag/ExternalProject_liblangtag.mk vendored
View file

@ -32,13 +32,13 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
$(gb_CONFIGURE_PLATFORMS) \
$(if $(CROSS_COMPILING),$(if $(filter WNT,$(OS)),"lt_cv_c99_vsnprintf=yes" "ac_cv_va_copy=yes","ac_cv_va_copy=no")) \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \
$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \
&& $(if $(verbose),V=1) \
$(MAKE) \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst $$,$$$$,$(call gb_Helper_extend_ld_path,$(gb_UnpackedTarball_workdir)/liblangtag/liblangtag/.libs)))' \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl URELIB \
$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \

2
external/libmwaw/Library_mwaw.mk vendored
View file

@ -20,7 +20,7 @@ $(eval $(call gb_Library_set_warnings_disabled,mwaw))
$(eval $(call gb_Library_set_precompiled_header,mwaw,external/libmwaw/inc/pch/precompiled_mwaw))
$(eval $(call gb_Library_set_include,mwaw,\
-I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
-I$(gb_UnpackedTarball_workdir)/libmwaw/inc \
$$(INCLUDE) \
))

2
external/libodfgen/Library_odfgen.mk vendored
View file

@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_externals,odfgen,\
$(eval $(call gb_Library_set_warnings_disabled,odfgen))
$(eval $(call gb_Library_set_include,odfgen,\
-I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \
-I$(gb_UnpackedTarball_workdir)/libodfgen/inc \
$$(INCLUDE) \
))

4
external/liborcus/Library_orcus-parser.mk vendored
View file

@ -24,8 +24,8 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser))
$(eval $(call gb_Library_set_precompiled_header,orcus-parser,external/liborcus/inc/pch/precompiled_orcus-parser))
$(eval $(call gb_Library_set_include,orcus-parser,\
-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
-I$(gb_UnpackedTarball_workdir)/liborcus/include \
-I$(gb_UnpackedTarball_workdir)/liborcus/src/include \
$$(INCLUDE) \
))

4
external/liborcus/Library_orcus.mk vendored
View file

@ -25,8 +25,8 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus))
$(eval $(call gb_Library_set_precompiled_header,orcus,external/liborcus/inc/pch/precompiled_orcus))
$(eval $(call gb_Library_set_include,orcus,\
-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
-I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \
-I$(gb_UnpackedTarball_workdir)/liborcus/include \
-I$(gb_UnpackedTarball_workdir)/liborcus/src/include \
$$(INCLUDE) \
))

2
external/librevenge/Library_revenge.mk vendored
View file

@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_externals,revenge,\
$(eval $(call gb_Library_set_warnings_disabled,revenge))
$(eval $(call gb_Library_set_include,revenge,\
-I$(call gb_UnpackedTarball_get_dir,librevenge)/inc \
-I$(gb_UnpackedTarball_workdir)/librevenge/inc \
$$(INCLUDE) \
))

4
external/libstaroffice/Library_staroffice.mk vendored
View file

@ -20,8 +20,8 @@ $(eval $(call gb_Library_set_warnings_disabled,staroffice))
$(eval $(call gb_Library_set_precompiled_header,staroffice,external/libstaroffice/inc/pch/precompiled_staroffice))
$(eval $(call gb_Library_set_include,staroffice,\
-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \
-I$(gb_UnpackedTarball_workdir)/libstaroffice/inc \
-I$(gb_UnpackedTarball_workdir)/libstaroffice/src/lib \
$$(INCLUDE) \
))

10
external/libtiff/ExternalProject_libtiff.mk vendored
View file

@ -52,14 +52,14 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) :
--without-x \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libtiff) $(gb_EMSCRIPTEN_CFLAGS)" \
$(if $(SYSTEM_ZLIB),,--with-zlib-include-dir="$(call gb_UnpackedTarball_get_dir,zlib)") \
$(if $(SYSTEM_ZLIB),,--with-zlib-include-dir="$(gb_UnpackedTarball_workdir)/zlib") \
$(if $(SYSTEM_ZLIB),,--with-zlib-lib-dir="$(gb_StaticLibrary_WORKDIR)") \
$(if $(SYSTEM_LIBJPEG),,--with-jpeg-include-dir="$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)") \
$(if $(SYSTEM_LIBJPEG),,--with-jpeg-include-dir="$(gb_UnpackedTarball_workdir)/libjpeg-turbo") \
$(if $(SYSTEM_LIBJPEG),,--with-jpeg-lib-dir="$(gb_StaticLibrary_WORKDIR)") \
$(if $(SYSTEM_LIBWEBP),,--with-webp-include-dir="$(call gb_UnpackedTarball_get_dir,libwebp/src)") \
$(if $(SYSTEM_LIBWEBP),,--with-webp-include-dir="$(gb_UnpackedTarball_workdir)/libwebp/src") \
$(if $(SYSTEM_LIBWEBP),,$(if $(filter WNT,$(OS_FOR_BUILD)),\
--with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT)", \
--with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs")) \
--with-webp-lib-dir="$(gb_UnpackedTarball_workdir)/libwebp/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT)", \
--with-webp-lib-dir="$(gb_UnpackedTarball_workdir)/libwebp/src/.libs")) \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS)" \
LDFLAGS="$(call gb_ExternalProject_get_link_flags,libtiff) $(gb_EMSCRIPTEN_LDFLAGS)" \
ac_cv_lib_z_inflateEnd=yes \

4
external/libwpd/Library_wpd.mk vendored
View file

@ -19,8 +19,8 @@ $(eval $(call gb_Library_use_externals,wpd,\
$(eval $(call gb_Library_set_warnings_disabled,wpd))
$(eval $(call gb_Library_set_include,wpd,\
-I$(call gb_UnpackedTarball_get_dir,libwpd)/inc \
-I$(call gb_UnpackedTarball_get_dir,libwpd)/src/lib \
-I$(gb_UnpackedTarball_workdir)/libwpd/inc \
-I$(gb_UnpackedTarball_workdir)/libwpd/src/lib \
$$(INCLUDE) \
))

2
external/libwpg/Library_wpg.mk vendored
View file

@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_externals,wpg,\
$(eval $(call gb_Library_set_warnings_disabled,wpg))
$(eval $(call gb_Library_set_include,wpg,\
-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
-I$(gb_UnpackedTarball_workdir)/libwpg/inc \
$$(INCLUDE) \
))

4
external/libwps/Library_wps.mk vendored
View file

@ -18,8 +18,8 @@ $(eval $(call gb_Library_use_externals,wps,\
$(eval $(call gb_Library_set_warnings_disabled,wps))
$(eval $(call gb_Library_set_include,wps,\
-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
-I$(call gb_UnpackedTarball_get_dir,libwps)/src/lib \
-I$(gb_UnpackedTarball_workdir)/libwps/inc \
-I$(gb_UnpackedTarball_workdir)/libwps/src/lib \
$$(INCLUDE) \
))

4
external/libxslt/ExternalProject_libxslt.mk vendored
View file

@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
vcmanifest=yes \
lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
lib=$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc \
&& nmake \
,win32)
$(call gb_Trace_EndRange,libxslt,EXTERNAL)
@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter iOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,libxml2)) \
$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(gb_UnpackedTarball_workdir)/libxml2) \
&& chmod 777 xslt-config \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),\

14
external/lxml/ExternalProject_lxml.mk vendored
View file

@ -24,17 +24,17 @@ $(call gb_ExternalProject_get_state_target,lxml,build): \
$(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_Trace_StartRange,lxml,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \
export PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(gb_UnpackedTarball_workdir)/lxml/install && \
$(if $(PYTHON_FOR_BUILD), \
unset MACOSX_DEPLOYMENT_TARGET && , \
CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)" && \
CFLAGS="$$CFLAGS -I$(call gb_UnpackedTarball_get_dir,python3)/Include" && \
LDFLAGS="$$LDFLAGS -L$(call gb_UnpackedTarball_get_dir,python3)" && \
_PYTHON_PROJECT_BASE=$(call gb_UnpackedTarball_get_dir,python3) && \
CFLAGS="$$CFLAGS -I$(gb_UnpackedTarball_workdir)/python3" && \
CFLAGS="$$CFLAGS -I$(gb_UnpackedTarball_workdir)/python3/Include" && \
LDFLAGS="$$LDFLAGS -L$(gb_UnpackedTarball_workdir)/python3" && \
_PYTHON_PROJECT_BASE=$(gb_UnpackedTarball_workdir)/python3 && \
export CFLAGS LDFLAGS _PYTHON_PROJECT_BASE && ) \
$(lxml_PYTHON) setup.py build \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
$(if $(SYSTEM_LIBXSLT),,--with-xslt-config=$(call gb_UnpackedTarball_get_dir,libxslt)/xslt-config) && \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
$(if $(SYSTEM_LIBXSLT),,--with-xslt-config=$(gb_UnpackedTarball_workdir)/libxslt/xslt-config) && \
rm -fr install && \
mkdir install && \
$(lxml_PYTHON) setup.py install \

4
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk vendored
View file

@ -15,7 +15,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mariadb-connector-c,mariadb-connecto
$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/include \
-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/include \
))
# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
@ -27,7 +27,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL -DHAVE_WINCRYPT))
$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
-I$(gb_UnpackedTarball_workdir)/mariadb-connector-c/win-iconv \
))
else
$(eval $(call gb_StaticLibrary_use_external,mariadb-connector-c,openssl_headers))

2
external/mdnsresponder/StaticLibrary_mDNSResponder.mk vendored
View file

@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,mDNSResponder))
$(eval $(call gb_StaticLibrary_use_unpacked,mDNSResponder,mDNSResponder))
$(eval $(call gb_StaticLibrary_set_include,mDNSResponder,\
-I$(call gb_UnpackedTarball_get_dir,mDNSResponder)/mDNSShared \
-I$(gb_UnpackedTarball_workdir)/mDNSResponder/mDNSShared \
$$(INCLUDE) \
))

4
external/nss/ExternalProject_nss.mk vendored
View file

@ -83,9 +83,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
$(if $(filter ANDROID,$(OS)),OS_TARGET=Android OS_TARGET_RELEASE=$(ANDROID_API_LEVEL) ARCHFLAG="" DEFAULT_COMPILER=clang ANDROID_NDK=$(ANDROID_NDK_DIR) ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION) ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(ANDROID_NDK_DIR)/sysroot) \
NSS_DISABLE_GTESTS=1 \
nss_build_all \
&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
&& rm -f $(gb_UnpackedTarball_workdir)/nss/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
&& chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
&& chmod u+w $(gb_UnpackedTarball_workdir)/nss/dist/out/lib/*.dylib \
&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(EXTERNAL_WORKDIR)/dist/out/lib/libfreebl3.dylib \

2
external/onlineupdate/CustomTarget_generated.mk vendored
View file

@ -16,7 +16,7 @@ $(onlineupdate_INC)/primaryCert.h $(onlineupdate_INC)/secondaryCert.h : \
| $(call gb_UnpackedTarball_get_target,onlineupdate)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1)
mkdir -p $(dir $@)
PYPATH=$${PYPATH:+$$PYPATH$(gb_CLASSPATHSEP)}'$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater' $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/onlineupdate/generate.py $@ '$(ONLINEUPDATE_MAR_CERTIFICATEDER)'
PYPATH=$${PYPATH:+$$PYPATH$(gb_CLASSPATHSEP)}'$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater' $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/onlineupdate/generate.py $@ '$(ONLINEUPDATE_MAR_CERTIFICATEDER)'
$(call gb_CustomTarget_get_target,external/onlineupdate/generated) : \
$(onlineupdate_INC)/primaryCert.h \

8
external/onlineupdate/Executable_mar.mk vendored
View file

@ -12,10 +12,10 @@ $(eval $(call gb_Executable_Executable,mar))
$(eval $(call gb_Executable_use_unpacked,mar,onlineupdate))
$(eval $(call gb_Executable_set_include,mar,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/verify/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/sign/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/verify/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/sign/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
$$(INCLUDE) \
))

4
external/onlineupdate/Executable_mbsdiff.mk vendored
View file

@ -12,8 +12,8 @@ $(eval $(call gb_Executable_Executable,mbsdiff))
$(eval $(call gb_Executable_use_unpacked,mbsdiff,onlineupdate))
$(eval $(call gb_Executable_set_include,mbsdiff,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/updater \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/updater \
$$(INCLUDE) \
))

14
external/onlineupdate/Executable_test_updater_dialog.mk vendored
View file

@ -12,13 +12,13 @@ $(eval $(call gb_Executable_Executable,test_updater_dialog))
$(eval $(call gb_Executable_use_unpacked,test_updater_dialog,onlineupdate))
$(eval $(call gb_Executable_set_include,test_updater_dialog,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/xpcom/glue \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/xpcom/glue \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
$$(INCLUDE) \
$(if $(filter-out WNT,$(OS)),$$(GTK3_CFLAGS) ) \
))

22
external/onlineupdate/Executable_update_service.mk vendored
View file

@ -14,17 +14,17 @@ $(eval $(call gb_Executable_use_unpacked,update_service,onlineupdate))
$(eval $(call gb_Executable_set_targettype_gui,update_service,YES))
$(eval $(call gb_Executable_set_include,update_service,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/verify/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/sign/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/xre \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/base \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/string \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/verify/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/sign/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/xre \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/base \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/string \
$$(INCLUDE) \
))

24
external/onlineupdate/Executable_updater.mk vendored
View file

@ -12,18 +12,18 @@ $(eval $(call gb_Executable_Executable,updater))
$(eval $(call gb_Executable_use_unpacked,updater,onlineupdate))
$(eval $(call gb_Executable_set_include,updater,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/xpcom/glue \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/service \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/modules/xz-embedded/src \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/updater \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/xre \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/base \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/string \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/xpcom/glue \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/service \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/modules/xz-embedded/src \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/updater \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/xre \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/base \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/string \
$$(INCLUDE) \
$(if $(filter-out WNT,$(OS)),$$(GTK3_CFLAGS) ) \
))

2
external/onlineupdate/Library_install_updateservice.mk vendored
View file

@ -12,7 +12,7 @@ $(eval $(call gb_Library_Library,install_updateservice))
$(eval $(call gb_Library_use_unpacked,install_updateservice,onlineupdate))
$(eval $(call gb_Library_set_include,install_updateservice, \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
$$(INCLUDE) \
))

6
external/onlineupdate/StaticLibrary_libmar.mk vendored
View file

@ -12,9 +12,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libmar))
$(eval $(call gb_StaticLibrary_use_unpacked,libmar,onlineupdate))
$(eval $(call gb_StaticLibrary_set_include,libmar,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/other-licenses/nsis/Contrib/CityHash/cityhash \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/other-licenses/nsis/Contrib/CityHash/cityhash \
$$(INCLUDE) \
))

4
external/onlineupdate/StaticLibrary_libmarverify.mk vendored
View file

@ -12,8 +12,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libmarverify))
$(eval $(call gb_StaticLibrary_use_unpacked,libmarverify,onlineupdate))
$(eval $(call gb_StaticLibrary_set_include,libmarverify,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/libmar/src/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/libmar/src/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
$$(INCLUDE) \
))

16
external/onlineupdate/StaticLibrary_updatehelper.mk vendored
View file

@ -12,14 +12,14 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,updatehelper))
$(eval $(call gb_StaticLibrary_use_unpacked,updatehelper,onlineupdate))
$(eval $(call gb_StaticLibrary_set_include,updatehelper,\
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/inc/ \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/service \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include/onlineupdate \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/include \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/mfbt/double-conversion \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/toolkit/mozapps/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/xpcom/base \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/inc/ \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/service \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include/onlineupdate \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/include \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/mfbt/double-conversion \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/toolkit/mozapps/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/xpcom/base \
$$(INCLUDE) \
))

8
external/onlineupdate/WinResTarget_updater.mk vendored
View file

@ -5,11 +5,11 @@ $(call gb_WinResTarget_get_target,updaterres,updaterres): | \
$(eval $(call gb_WinResTarget_set_include,updaterres,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/common \
-I$(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/common \
-I$(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater \
))
$(call gb_WinResTarget_get_clean_target,updaterres): \
RCFILE := $(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/updater.rc
RCFILE := $(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/updater.rc
$(call gb_WinResTarget_get_target,updaterres): \
RCFILE := $(call gb_UnpackedTarball_get_dir,onlineupdate)/onlineupdate/source/update/updater/updater.rc
RCFILE := $(gb_UnpackedTarball_workdir)/onlineupdate/onlineupdate/source/update/updater/updater.rc

6
external/openldap/ExternalProject_openldap.mk vendored
View file

@ -26,7 +26,7 @@ endif
openldap_LDFLAGS = $(call gb_ExternalProject_get_link_flags,openldap)
ifeq ($(SYSTEM_OPENSSL),)
openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)
openldap_LDFLAGS += -L$(gb_UnpackedTarball_workdir)/openssl
endif
ifeq ($(OS),LINUX)
openldap_LDFLAGS += -pthread
@ -50,8 +50,8 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
$(if $(SYSTEM_OPENSSL), \
CPPFLAGS="$(CPPFLAGS) $(OPENSSL_CFLAGS)" CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(OPENSSL_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap)" LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS) $(OPENSSL_LIBS)" \
, \
CPPFLAGS="$(CPPFLAGS) -I$(call gb_UnpackedTarball_get_dir,openssl)/include" \
CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap) -I$(call gb_UnpackedTarball_get_dir,openssl)/include" \
CPPFLAGS="$(CPPFLAGS) -I$(gb_UnpackedTarball_workdir)/openssl/include" \
CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap) -I$(gb_UnpackedTarball_workdir)/openssl/include" \
) \
$(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \
&& MAKEFLAGS= && $(MAKE) \

12
external/pdfium/Library_pdfium.mk vendored
View file

@ -16,10 +16,10 @@ $(eval $(call gb_Library_set_warnings_disabled,pdfium))
$(eval $(call gb_Library_set_precompiled_header,pdfium,external/pdfium/inc/pch/precompiled_pdfium))
$(eval $(call gb_Library_set_include,pdfium,\
-I$(call gb_UnpackedTarball_get_dir,pdfium) \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/agg23 \
$(if $(filter TRUE,$(SYSTEM_ABSEIL)),$(ABSEIL_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/abseil-cpp) \
-I$(gb_UnpackedTarball_workdir)/pdfium \
-I$(gb_UnpackedTarball_workdir)/pdfium/third_party \
-I$(gb_UnpackedTarball_workdir)/pdfium/third_party/agg23 \
$(if $(filter TRUE,$(SYSTEM_ABSEIL)),$(ABSEIL_CFLAGS),-I$(gb_UnpackedTarball_workdir)/pdfium/third_party/abseil-cpp) \
$(if $(filter TRUE,$(SYSTEM_OPENJPEG2)),$(OPENJPEG2_CFLAGS)) \
$$(INCLUDE) \
))
@ -603,8 +603,8 @@ $(eval $(call gb_Library_add_defs,pdfium,\
else
$(eval $(call gb_Library_set_include,pdfium,\
-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/include/ \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/src/include/ \
-I$(gb_UnpackedTarball_workdir)/pdfium/third_party/freetype/include/ \
-I$(gb_UnpackedTarball_workdir)/pdfium/third_party/freetype/src/include/ \
$$(INCLUDE) \
))

12
external/postgresql/ExternalProject_postgresql.mk vendored
View file

@ -43,17 +43,17 @@ endif
ifeq ($(ENABLE_OPENSSL),TRUE)
ifeq ($(SYSTEM_OPENSSL),)
postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include
postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl) $(if $(filter $(OS),LINUX),-pthread)
postgresql_CPPFLAGS += -I$(gb_UnpackedTarball_workdir)/openssl/include
postgresql_LDFLAGS += -L$(gb_UnpackedTarball_workdir)/openssl $(if $(filter $(OS),LINUX),-pthread)
endif
endif
ifeq ($(SYSTEM_OPENLDAP),)
postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include
postgresql_CPPFLAGS += -I$(gb_UnpackedTarball_workdir)/openldap/include
postgresql_LDFLAGS += \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \
-L$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap_r/.libs \
-L$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap/.libs \
-L$(gb_UnpackedTarball_workdir)/openldap/libraries/liblber/.libs \
endif

26
external/python3/ExternalProject_python3.mk vendored
View file

@ -37,12 +37,12 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_Trace_StartRange,python3,EXTERNAL)
$(call gb_ExternalProject_run,build,\
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build $(gb_MSBUILD_CONFIG_AND_PLATFORM) \
/p:bz2Dir=$(call gb_UnpackedTarball_get_dir,bzip2) \
/p:opensslIncludeDir=$(call gb_UnpackedTarball_get_dir,openssl)/include \
/p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl) \
/p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \
/p:libffiOutDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs \
/p:libffiIncludeDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/include \
/p:bz2Dir=$(gb_UnpackedTarball_workdir)/bzip2 \
/p:opensslIncludeDir=$(gb_UnpackedTarball_workdir)/openssl/include \
/p:opensslOutDir=$(gb_UnpackedTarball_workdir)/openssl \
/p:zlibDir=$(gb_UnpackedTarball_workdir)/zlib \
/p:libffiOutDir=$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)/.libs \
/p:libffiIncludeDir=$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)/include \
/maxcpucount \
/p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \
$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
@ -102,22 +102,22 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
--enable-shared \
) \
$(if $(ENABLE_OPENSSL),$(if $(SYSTEM_OPENSSL),,\
--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl) \
--with-openssl=$(gb_UnpackedTarball_workdir)/openssl \
) ) \
$(if $(filter LINUX,$(OS)), \
PKG_CONFIG_LIBDIR="$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)$${PKG_CONFIG_LIBDIR:+:$$PKG_CONFIG_LIBDIR}" \
PKG_CONFIG_LIBDIR="$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)$${PKG_CONFIG_LIBDIR:+:$$PKG_CONFIG_LIBDIR}" \
) \
CC="$(strip $(CC) \
$(if $(filter -fsanitize=undefined,$(CC)),-fno-sanitize=function) \
$(if $(SYSTEM_BZIP2),,-I$(call gb_UnpackedTarball_get_dir,bzip2)) \
$(if $(SYSTEM_EXPAT),,-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
$(if $(SYSTEM_BZIP2),,-I$(gb_UnpackedTarball_workdir)/bzip2) \
$(if $(SYSTEM_EXPAT),,-I$(gb_UnpackedTarball_workdir)/expat/lib) \
$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
)" \
$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
$(if $(filter -fsanitize=%,$(CC)),LINKCC="$(CXX) -pthread") \
LDFLAGS="$(strip $(LDFLAGS) \
$(if $(filter LINUX,$(OS)),-L$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs) \
$(if $(SYSTEM_BZIP2),,-L$(call gb_UnpackedTarball_get_dir,bzip2)) \
$(if $(filter LINUX,$(OS)),-L$(gb_UnpackedTarball_workdir)/libffi/$(HOST_PLATFORM)/.libs) \
$(if $(SYSTEM_BZIP2),,-L$(gb_UnpackedTarball_workdir)/bzip2) \
$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
$(if $(SYSTEM_ZLIB),,-L$(gb_StaticLibrary_WORKDIR)) \
$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
@ -142,7 +142,7 @@ endif
ifeq ($(OS),MACOSX)
python3_fw_prefix=$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework
python3_fw_prefix=$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO/LibreOfficePython.framework
# rule to allow relocating the whole framework, removing reference to buildinstallation directory
# also scripts are not allowed to be signed as executables (with extended attributes), but need to

2
external/python3/GeneratedPackage_python3.mk vendored
View file

@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO))
$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO))
$(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3))

2
external/redland/ExternalProject_raptor.mk vendored
View file

@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
, \
--enable-shared --disable-static \
) \
$(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
$(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
&& $(MAKE) \
)
$(call gb_Trace_EndRange,raptor,EXTERNAL)

6
external/redland/ExternalProject_rasqal.mk vendored
View file

@ -29,8 +29,8 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \
RAPTOR2_CFLAGS="-I$(gb_UnpackedTarball_workdir)/raptor/src" \
RAPTOR2_LIBS="-L$(gb_UnpackedTarball_workdir)/raptor/src/.libs -lraptor2" \
$(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \
--with-regex-library=posix \
--with-decimal=none \
@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
, \
--enable-shared --disable-static \
) \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(gb_UnpackedTarball_workdir)/libxml2/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \

8
external/redland/ExternalProject_redland.mk vendored
View file

@ -30,10 +30,10 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \
RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
RAPTOR2_CFLAGS="-I$(gb_UnpackedTarball_workdir)/raptor/src" \
RAPTOR2_LIBS="-L$(gb_UnpackedTarball_workdir)/raptor/src/.libs -lraptor2 $(LIBXML_LIBS)" \
RASQAL_CFLAGS="-I$(gb_UnpackedTarball_workdir)/rasqal/src" \
RASQAL_LIBS="-L$(gb_UnpackedTarball_workdir)/rasqal/src/.libs -lrasqal" \
$(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \
--disable-modular \
--without-threads \

2
external/redland/Library_raptor.mk vendored
View file

@ -10,7 +10,7 @@
$(eval $(call gb_Library_Library,raptor2))
$(eval $(call gb_Library_set_include,raptor2, \
-I$(call gb_UnpackedTarball_get_dir,raptor)/src \
-I$(gb_UnpackedTarball_workdir)/raptor/src \
$$(INCLUDE) \
))

6
external/redland/Library_rasqal.mk vendored
View file

@ -35,9 +35,9 @@ $(eval $(call gb_Library_add_defs,rasqal,\
))
$(eval $(call gb_Library_set_include,rasqal,\
-I$(call gb_UnpackedTarball_get_dir,rasqal)/libmtwist \
-I$(call gb_UnpackedTarball_get_dir,rasqal)/libsv \
-I$(call gb_UnpackedTarball_get_dir,rasqal)/src \
-I$(gb_UnpackedTarball_workdir)/rasqal/libmtwist \
-I$(gb_UnpackedTarball_workdir)/rasqal/libsv \
-I$(gb_UnpackedTarball_workdir)/rasqal/src \
$$(INCLUDE) \
))

2
external/redland/Library_rdf.mk vendored
View file

@ -10,7 +10,7 @@
$(eval $(call gb_Library_Library,rdf))
$(eval $(call gb_Library_set_include,rdf, \
-I$(call gb_UnpackedTarball_get_dir,redland)/src \
-I$(gb_UnpackedTarball_workdir)/redland/src \
$$(INCLUDE) \
))

34
external/rhino/ExternalProject_rhino.mk vendored
View file

@ -16,31 +16,31 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\
$(call gb_ExternalProject_get_state_target,rhino,build) :
$(call gb_Trace_StartRange,rhino,EXTERNAL)
$(call gb_ExternalProject_run,build,\
mkdir $(call gb_UnpackedTarball_get_dir,rhino)/build \
&& cd $(call gb_UnpackedTarball_get_dir,rhino) \
mkdir $(gb_UnpackedTarball_workdir)/rhino/build \
&& cd $(gb_UnpackedTarball_workdir)/rhino \
&& $(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) $(gb_JavaClassSet_JAVACDEBUG) \
-d $(call gb_UnpackedTarball_get_dir,rhino)/build/content \
-d $(gb_UnpackedTarball_workdir)/rhino/build/content \
@$(SRCDIR)/external/rhino/filelist.txt \
&& mkdir $(call gb_UnpackedTarball_get_dir,rhino)/build/content/META-INF \
&& cp $(call gb_UnpackedTarball_get_dir,rhino)/LICENSE.txt \
$(call gb_UnpackedTarball_get_dir,rhino)/NOTICE-tools.txt \
$(call gb_UnpackedTarball_get_dir,rhino)/NOTICE.txt \
$(call gb_UnpackedTarball_get_dir,rhino)/build/content/META-INF/ \
&& $(gb_Jar_JARCOMMAND) -cf $(call gb_UnpackedTarball_get_dir,rhino)/build/js.jar \
-C $(call gb_UnpackedTarball_get_dir,rhino)/build/content . \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
&& mkdir $(gb_UnpackedTarball_workdir)/rhino/build/content/META-INF \
&& cp $(gb_UnpackedTarball_workdir)/rhino/LICENSE.txt \
$(gb_UnpackedTarball_workdir)/rhino/NOTICE-tools.txt \
$(gb_UnpackedTarball_workdir)/rhino/NOTICE.txt \
$(gb_UnpackedTarball_workdir)/rhino/build/content/META-INF/ \
&& $(gb_Jar_JARCOMMAND) -cf $(gb_UnpackedTarball_workdir)/rhino/build/js.jar \
-C $(gb_UnpackedTarball_workdir)/rhino/build/content . \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/commonjs/module/package.html \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/commonjs/module/provider/package.html \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/resources/Messages.properties \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/resources/Messages_en.properties \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/resources/Messages_fr.properties \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/tools/debugger/test.js \
-C $(call gb_UnpackedTarball_get_dir,rhino)/src \
-C $(gb_UnpackedTarball_workdir)/rhino/src \
org/mozilla/javascript/tools/resources/Messages.properties \
)
$(call gb_Trace_EndRange,rhino,EXTERNAL)

8
external/skia/Library_skia.mk vendored
View file

@ -124,10 +124,10 @@ $(eval $(call gb_Library_use_libraries,skia,\
$(eval $(call gb_Library_set_include,skia,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,skia) \
-I$(call gb_UnpackedTarball_get_dir,skia)/modules/skcms/ \
-I$(call gb_UnpackedTarball_get_dir,skia)/third_party/vulkanmemoryallocator/ \
-I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan/ \
-I$(gb_UnpackedTarball_workdir)/skia \
-I$(gb_UnpackedTarball_workdir)/skia/modules/skcms/ \
-I$(gb_UnpackedTarball_workdir)/skia/third_party/vulkanmemoryallocator/ \
-I$(gb_UnpackedTarball_workdir)/skia/include/third_party/vulkan/ \
-I$(SRCDIR)/external/skia/inc/ \
))

10
external/xmlsec/ExternalProject_xmlsec.mk vendored
View file

@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(call gb_Trace_StartRange,xmlsec,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \
lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
lib=$(gb_UnpackedTarball_workdir)/libxml2/win32/bin.msvc \
$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes cruntime=/MDd) \
cflags="$(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \
&& nmake \
@ -57,13 +57,13 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
--without-openssl \
$(if $(SYSTEM_NSS),, \
$(if $(filter MACOSX,$(OS_FOR_BUILD)),--disable-pkgconfig) \
NSPR_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" NSPR_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lnspr4" \
NSS_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss" NSS_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lsmime3 -lnss3 -lnssutil3" \
NSPR_CFLAGS="-I$(gb_UnpackedTarball_workdir)/nss/dist/out/include" NSPR_LIBS="-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lnspr4" \
NSS_CFLAGS="-I$(gb_UnpackedTarball_workdir)/nss/dist/public/nss" NSS_LIBS="-L$(gb_UnpackedTarball_workdir)/nss/dist/out/lib -lsmime3 -lnss3 -lnssutil3" \
), \
$(if $(ENABLE_OPENSSL), \
$(if $(SYSTEM_OPENSSL),, \
OPENSSL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,openssl)/include" \
OPENSSL_LIBS="-L$(call gb_UnpackedTarball_get_dir,openssl) -lcrypto -lssl" \
OPENSSL_CFLAGS="-I$(gb_UnpackedTarball_workdir)/openssl/include" \
OPENSSL_LIBS="-L$(gb_UnpackedTarball_workdir)/openssl -lcrypto -lssl" \
), \
--without-openssl) \
) \

2
external/zlib/StaticLibrary_zlib_x64.mk vendored
View file

@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64))
$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\
-I$(call gb_UnpackedTarball_get_dir,zlib) \
-I$(gb_UnpackedTarball_workdir)/zlib \
$$(INCLUDE) \
))

2
external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk vendored
View file

@ -17,7 +17,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,zxcvbn-c))
$(eval $(call gb_StaticLibrary_use_external_project,zxcvbn-c,zxcvbn-c,full))
$(eval $(call gb_StaticLibrary_set_include,zxcvbn-c,\
-I$(call gb_UnpackedTarball_get_dir,zxcvbn-c)\
-I$(gb_UnpackedTarball_workdir)/zxcvbn-c\
$$(INCLUDE)\
))

2
external/zxing/StaticLibrary_zxing.mk vendored
View file

@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_use_external,zxing,icu_headers))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,zxing))
$(eval $(call gb_StaticLibrary_set_include,zxing,\
-I$(call gb_UnpackedTarball_get_dir,zxing/core/src/) \
-I$(gb_UnpackedTarball_workdir)/zxing/core/src/ \
$$(INCLUDE) \
))

2
i18npool/CustomTarget_breakiterator.mk
View file

@ -62,7 +62,7 @@ $(i18npool_BIDIR)/%.brk : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt \
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),BRK)
$(call gb_Helper_abbreviate_dirs,\
$(call gb_ExternalExecutable_get_command,genbrk) \
$(if $(SYSTEM_ICU),,-i $(call gb_UnpackedTarball_get_dir,icu)/source/data/out/tmp) \
$(if $(SYSTEM_ICU),,-i $(gb_UnpackedTarball_workdir)/icu/source/data/out/tmp) \
-r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),BRK)

4
jurt/Library_jpipe.mk
View file

@ -67,8 +67,8 @@ $(eval $(call gb_Library_set_include,jpipe, \
-I$(SRCDIR)/sal/osl/unx \
-I$(SRCDIR)/sal/rtl \
-I$(SRCDIR)/sal/textenc \
-I$(call gb_UnpackedTarball_get_dir,dtoa) \
-I$(call gb_UnpackedTarball_get_dir,dtoa/include) \
-I$(gb_UnpackedTarball_workdir)/dtoa \
-I$(gb_UnpackedTarball_workdir)/dtoa/include \
))
$(eval $(call gb_Library_use_externals,jpipe, \

4
solenv/gbuild/ExternalPackage.mk
View file

@ -58,7 +58,7 @@ endef
#
# gb_ExternalPackage_ExternalPackage_internal name unpacked
define gb_ExternalPackage_ExternalPackage_internal
$(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2)))
$(call gb_Package_Package_internal,$(1),$(gb_UnpackedTarball_workdir)/$(2))
$(call gb_Package_use_unpacked,$(1),$(2))
$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
@ -86,7 +86,7 @@ endef
#
# gb_ExternalPackage_mark_generated_file package file
define gb_ExternalPackage_mark_generated_file
$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(2) : \
$(gb_UnpackedTarball_workdir)/$(gb_ExternalPackage_UNPACKED_$(1))/$(2) : \
$(call gb_ExternalProject_get_target,$(gb_ExternalPackage_PROJECT_$(1)))
$(if $(suffix $(2)),\
$(call gb_UnpackedTarbal__ensure_pattern_rule,$(gb_ExternalPackage_UNPACKED_$(1)),$(suffix $(2))),\

2
solenv/gbuild/ExternalProject.mk
View file

@ -73,7 +73,7 @@ $(call gb_ExternalProject_get_clean_target,%) :
#
# gb_ExternalProject_ExternalProject project
define gb_ExternalProject_ExternalProject
$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(1))
$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(gb_UnpackedTarball_workdir)/$(1)
$(call gb_ExternalProject_get_preparation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir

3
solenv/gbuild/TargetLocations.mk
View file

@ -207,7 +207,8 @@ gb_UnoApiHeadersTarget_get_real_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/nor
gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap).done
gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive).done
gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),normal).done
gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1)
gb_UnpackedTarball_get_dir = $(error please use plain gb_UnpackedTarball_workdir instead)
gb_UnpackedTarball_workdir := $(WORKDIR)/UnpackedTarball
gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org
gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update
# NOTE: the .done target is hardcoded in solenv/bin/concat-deps.c !

2
solenv/gbuild/UIConfig.mk
View file

@ -98,7 +98,7 @@ endef
gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
ifneq ($(filter LXML,$(BUILD_TYPE)),)
gb_UIConfig_LXML_PATH := PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install ;
gb_UIConfig_LXML_PATH := PYTHONPATH=$${PYTHONPATH:+$$PYTHONPATH:}$(gb_UnpackedTarball_workdir)/lxml/install ;
gb_UIConfig_LXML_TARGET := $(call gb_ExternalProject_get_target,lxml)
endif
gb_UIConfig_gla11y_SCRIPT := $(SRCDIR)/bin/gla11y

28
solenv/gbuild/UnpackedTarball.mk
View file

@ -151,7 +151,7 @@ $(call gb_Helper_abbreviate_dirs,\
) \
$(if $(gb_KEEP_PRISTINE), \
rm -fr $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \
cp -r $(call gb_UnpackedTarball_get_dir,$(2)) $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \
cp -r $(gb_UnpackedTarball_workdir)/$(2) $(call gb_UnpackedTarball_get_pristine_dir,$(2)) && \
) \
touch $(1) \
)\
@ -172,7 +172,7 @@ $(call gb_UnpackedTarball_get_preparation_target,%) :
$(call gb_UnpackedTarball_get_target,%) :
$(call gb_Output_announce,$*,$(true),PAT,2)
$(call gb_Trace_StartRange,$*,PAT)
$(call gb_UnpackedTarball__command,$@,$*,$(call gb_UnpackedTarball_get_dir,$*))
$(call gb_UnpackedTarball__command,$@,$*,$(gb_UnpackedTarball_workdir)/$*)
$(call gb_Trace_EndRange,$*,PAT)
$(call gb_UnpackedTarball_get_final_target,%) :
@ -186,7 +186,7 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
$(call gb_UnpackedTarball_get_final_target,$*) \
$(call gb_UnpackedTarball_get_target,$*) \
$(call gb_UnpackedTarball_get_preparation_target,$*) \
$(call gb_UnpackedTarball_get_dir,$*) \
$(gb_UnpackedTarball_workdir)/$* \
$(call gb_UnpackedTarball_get_pristine_dir,$*) \
)
@ -229,14 +229,14 @@ endef
#
# gb_UnpackedTarball_fix_end_of_line unpacked file(s)
define gb_UnpackedTarball_fix_end_of_line
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL += $(addprefix $(call gb_UnpackedTarball_get_dir,$(1))/,$(2))
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL += $(addprefix $(gb_UnpackedTarball_workdir)/$(1)/,$(2))
endef
# Internal version of set_tarball, mostly to avoid repeated invocation of $(shell
define gb_UnpackedTarball_set_tarball_internal
$(call gb_UnpackedTarget_UnpackedTarget,$(2),$(call gb_UnpackedTarball_get_dir,$(1)),$(3),$(4))
$(call gb_UnpackedTarget_UnpackedTarget,$(2),$(gb_UnpackedTarball_workdir)/$(1),$(3),$(4))
$(call gb_UnpackedTarball_get_target,$(1)) : $(call gb_UnpackedTarget_get_target,$(2))
$(call gb_UnpackedTarball_get_clean_target,$(1)) : $(call gb_UnpackedTarget_get_clean_target,$(2))
$(call gb_UnpackedTarget_get_target,$(2)) : $(call gb_UnpackedTarball_get_preparation_target,$(1))
@ -247,7 +247,7 @@ $(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(TARFILE_LOCATI
$(TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4))
$$(call gb_Output_announce,$(6),$(true),PKB,3)
$$(call gb_Trace_StartRange,$(6),PKB)
if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi
if test ! -f "$$@" ; then cd $(gb_UnpackedTarball_workdir)/ && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi
$$(call gb_Trace_EndRange,$(6),PKB)
)
@ -314,7 +314,7 @@ endef
# gb_UnpackedTarball_add_file unpacked destfile file
define gb_UnpackedTarball_add_file
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FILES += $(SRCDIR)/$(3)
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES += $(call gb_UnpackedTarball_get_dir,$(1))/$(2)
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES += $(gb_UnpackedTarball_workdir)/$(1)/$(2)
$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(SRCDIR)/$(3)
endef
@ -363,7 +363,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION := $(strip $(2
endef
define gb_UnpackedTarbal__make_pattern_rule
$(call gb_UnpackedTarball_get_dir,$(1))/%$(2) :
$(gb_UnpackedTarball_workdir)/$(1)/%$(2) :
$$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball))
$$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \
touch $$@
@ -378,7 +378,7 @@ $(if $(filter $(2),$(gb_UnpackedTarball_PATTERN_RULES_$(1))),,$(call gb_Unpacked
endef
define gb_UnpackedTarbal__make_file_rule
$(call gb_UnpackedTarball_get_dir,$(1))/$(2) :
$(gb_UnpackedTarball_workdir)/$(1)/$(2) :
$$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball))
$$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \
touch $$@
@ -395,9 +395,9 @@ endef
#
# gb_UnpackedTarball_mark_output_file unpacked file
define gb_UnpackedTarball_mark_output_file
$(call gb_UnpackedTarball_get_final_target,$(1)) : $(call gb_UnpackedTarball_get_dir,$(1))/$(2)
$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $(call gb_UnpackedTarball_get_target,$(1))
$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : UNPACKED_MODE := 644
$(call gb_UnpackedTarball_get_final_target,$(1)) : $(gb_UnpackedTarball_workdir)/$(1)/$(2)
$(gb_UnpackedTarball_workdir)/$(1)/$(2) : $(call gb_UnpackedTarball_get_target,$(1))
$(gb_UnpackedTarball_workdir)/$(1)/$(2) : UNPACKED_MODE := 644
$(if $(suffix $(2)),\
$(call gb_UnpackedTarbal__ensure_pattern_rule,$(1),$(suffix $(2))),\
$(call gb_UnpackedTarbal__make_file_rule,$(1),$(2)) \
@ -440,10 +440,10 @@ endef
fi
%.genpatch :
if [ -d $(call gb_UnpackedTarball_get_dir,$*) -a -d $(call gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \
if [ -d $(gb_UnpackedTarball_workdir)/$* -a -d $(call gb_UnpackedTarball_get_pristine_dir,$*) ] ; then \
( \
patch_file=$$(pwd)/$*.new.patch.1; \
cd $(call gb_UnpackedTarball_get_dir,) ; \
cd $(gb_UnpackedTarball_workdir)/ ; \
diff -ur $*.org $* > $$patch_file; \
echo "Patch $$patch_file generated" ; \
); \

14
swext/Extension_wiki-publisher.mk
View file

@ -32,13 +32,13 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(SRCD
$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(SRCDIR)/swext/mediawiki/dialogs/script.xlb))
$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(SRCDIR)/swext/mediawiki/dialogs/dialog.xlb))
$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(SRCDIR)/swext/mediawiki/dialogs/SendToMediaWiki.xdl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/cmarkup.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/entities.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/glayout.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/mmltex.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/scripts.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/tables.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(call gb_UnpackedTarball_get_dir,xsltml)/tokens.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(gb_UnpackedTarball_workdir)/xsltml/cmarkup.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(gb_UnpackedTarball_workdir)/xsltml/entities.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(gb_UnpackedTarball_workdir)/xsltml/glayout.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(gb_UnpackedTarball_workdir)/xsltml/mmltex.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(gb_UnpackedTarball_workdir)/xsltml/scripts.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(gb_UnpackedTarball_workdir)/xsltml/tables.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(gb_UnpackedTarball_workdir)/xsltml/tokens.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html))
$(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott))

2
winaccessibility/CustomTarget_ia2_idl.mk
View file

@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,winaccessibility/ia2/idl))
iaccessible2_DIR := $(call gb_UnpackedTarball_get_dir,IAccessible2)
iaccessible2_DIR := $(gb_UnpackedTarball_workdir)/IAccessible2
wina11y_COMIDLDIR := $(gb_CustomTarget_workdir)/winaccessibility/ia2/idl
wina11y_SOURCE := $(SRCDIR)/winaccessibility/source/UAccCOMIDL

10
xmlsecurity/Library_xsec_xmlsec.mk
View file

@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
-I$(SRCDIR)/xmlsecurity/inc \
-I$(SRCDIR)/xmlsecurity/source/gpg \
-I$(SRCDIR)/xmlsecurity/source/xmlsec \
-I$(call gb_UnpackedTarball_get_dir,xmlsec/include) \
-I$(gb_UnpackedTarball_workdir)/xmlsec/include \
))
$(eval $(call gb_Library_use_custom_headers,xsec_xmlsec,\
@ -93,8 +93,8 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
))
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscng.lib \
$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
$(gb_UnpackedTarball_workdir)/xmlsec/win32/binaries/libxmlsec-mscng.lib \
$(gb_UnpackedTarball_workdir)/xmlsec/win32/binaries/libxmlsec.lib \
))
$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\
@ -132,7 +132,7 @@ else # !$(OS),WNT
ifeq ($(SYSTEM_XMLSEC),)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
$(gb_UnpackedTarball_workdir)/xmlsec/src/.libs/libxmlsec1.a \
))
endif
@ -140,7 +140,7 @@ ifeq ($(ENABLE_NSS),TRUE)
ifeq ($(SYSTEM_XMLSEC),)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
$(gb_UnpackedTarball_workdir)/xmlsec/src/nss/.libs/libxmlsec1-nss.a \
))
endif