[Libreoffice-commits] core.git: vcl/Library_vcl.mk
Chris Sherlock
chris.sherlock79 at gmail.com
Sat Apr 21 02:06:12 UTC 2018
vcl/Library_vcl.mk | 166 ++++++++++++++++++++++++++---------------------------
1 file changed, 83 insertions(+), 83 deletions(-)
New commits:
commit 9374352f242d2dcfd39a3a6f0504efbaf1abb2dc
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Apr 20 23:07:19 2018 +1000
vcl: get rid of tabs in vcl/Library_vcl.mk
Change-Id: I2c48efdf82e6433847f90ac0309935cb442b01b5
Reviewed-on: https://gerrit.libreoffice.org/53207
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index cfd5da379ab3..dc3b8a3318c6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -45,10 +45,10 @@ $(eval $(call gb_Library_set_include,vcl,\
$(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \
-DDLLIMPLEMENTATION_UITEST \
- -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
- -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
- -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \
- -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
+ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
+ -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
+ -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \
+ -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
))
ifeq ($(SYSTEM_GLM),TRUE)
@@ -60,18 +60,18 @@ endif
$(eval $(call gb_Library_use_sdk_api,vcl))
$(eval $(call gb_Library_use_custom_headers,vcl,\
- officecfg/registry \
+ officecfg/registry \
))
$(eval $(call gb_Library_use_externals,vcl,\
- libjpeg \
- libeot \
- $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
+ libjpeg \
+ libeot \
+ $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
))
$(eval $(call gb_Library_use_libraries,vcl,\
$(call gb_Helper_optional,BREAKPAD, \
- crashreport) \
+ crashreport) \
svl \
tl \
utl \
@@ -112,15 +112,15 @@ $(eval $(call gb_Library_use_libraries,vcl,\
endif
$(eval $(call gb_Library_use_externals,vcl,\
- boost_headers \
- gio \
- glm_headers \
- graphite \
- harfbuzz \
- icu_headers \
- icuuc \
- lcms2 \
- mdds_headers \
+ boost_headers \
+ gio \
+ glm_headers \
+ graphite \
+ harfbuzz \
+ icu_headers \
+ icuuc \
+ lcms2 \
+ mdds_headers \
))
ifeq ($(ENABLE_HEADLESS),)
$(eval $(call gb_Library_use_externals,vcl,\
@@ -318,7 +318,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/bitmap/BitmapColorizeFilter \
vcl/source/bitmap/bitmappaint \
vcl/source/bitmap/BitmapGaussianSeparableBlurFilter \
- vcl/source/bitmap/BitmapFastScaleFilter \
+ vcl/source/bitmap/BitmapFastScaleFilter \
vcl/source/bitmap/BitmapScaleSuperFilter \
vcl/source/bitmap/BitmapScaleConvolutionFilter \
vcl/source/bitmap/BitmapSymmetryCheck \
@@ -346,10 +346,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/app/dndhelp \
vcl/source/app/help \
vcl/source/app/i18nhelp \
- vcl/source/app/idle \
- vcl/source/app/salusereventlist \
+ vcl/source/app/idle \
+ vcl/source/app/salusereventlist \
vcl/source/app/salvtables \
- vcl/source/app/scheduler \
+ vcl/source/app/scheduler \
vcl/source/app/session \
vcl/source/app/settings \
vcl/source/app/IconThemeInfo \
@@ -447,7 +447,7 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
))
$(eval $(call gb_Library_add_defs,vcl,\
- -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
+ -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
@@ -455,7 +455,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
))
$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
- ApplicationServices \
+ ApplicationServices \
))
$(eval $(call gb_Library_add_objcxxobjects,vcl,\
@@ -537,9 +537,9 @@ endif
vcl_headless_code= \
vcl/headless/svpframe \
$(if $(filter-out IOS,$(OS)), \
- vcl/headless/svpbmp \
- vcl/headless/svpgdi \
- vcl/headless/svpdata) \
+ vcl/headless/svpbmp \
+ vcl/headless/svpgdi \
+ vcl/headless/svpdata) \
vcl/headless/svpdummies \
vcl/headless/svpinst \
vcl/headless/svpvd \
@@ -580,7 +580,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
$(if $(filter TRUE,$(ENABLE_CUPS)),\
vcl/unx/generic/printer/cupsmgr \
vcl/unx/generic/printer/printerinfomanager \
- , \
+ , \
vcl/null/printerinfomanager \
) \
$(vcl_headless_code) \
@@ -588,12 +588,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
))
$(eval $(call gb_Library_use_externals,vcl,\
- cairo \
- cups \
- dbus \
- fontconfig \
- freetype \
- valgrind \
+ cairo \
+ cups \
+ dbus \
+ fontconfig \
+ freetype \
+ valgrind \
))
endif
@@ -608,9 +608,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
))
$(eval $(call gb_Library_use_externals,vcl,\
- cairo \
- freetype \
- fontconfig \
+ cairo \
+ freetype \
+ fontconfig \
))
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,vcl,\
@@ -619,17 +619,17 @@ $(eval $(call gb_Library_add_libs,vcl,\
endif
else
$(eval $(call gb_Library_add_exception_objects,vcl,\
- vcl/opengl/DeviceInfo \
- vcl/opengl/gdiimpl \
- vcl/opengl/salbmp \
- vcl/opengl/scale \
- vcl/opengl/framebuffer \
- vcl/opengl/program \
- vcl/opengl/texture \
- vcl/opengl/FixedTextureAtlas \
- vcl/opengl/PackedTextureAtlas \
- vcl/opengl/RenderList \
- vcl/opengl/LineRenderUtils \
+ vcl/opengl/DeviceInfo \
+ vcl/opengl/gdiimpl \
+ vcl/opengl/salbmp \
+ vcl/opengl/scale \
+ vcl/opengl/framebuffer \
+ vcl/opengl/program \
+ vcl/opengl/texture \
+ vcl/opengl/FixedTextureAtlas \
+ vcl/opengl/PackedTextureAtlas \
+ vcl/opengl/RenderList \
+ vcl/opengl/LineRenderUtils \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
vcl/source/window/openglwin \
@@ -642,7 +642,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lXext \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
- vcl/opengl/x11/X11DeviceInfo \
+ vcl/opengl/x11/X11DeviceInfo \
))
endif
endif
@@ -657,22 +657,22 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
))
$(eval $(call gb_Library_add_libs,vcl,\
- -lbe \
+ -lbe \
))
$(eval $(call gb_Library_use_externals,vcl,\
- cairo \
- fontconfig \
- freetype \
- expat \
+ cairo \
+ fontconfig \
+ freetype \
+ expat \
))
endif
ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_libs,vcl,\
- -llog \
- -landroid \
- -llo-bootstrap \
+ -llog \
+ -landroid \
+ -llo-bootstrap \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/unx/generic/printer/jobdata \
@@ -684,10 +684,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
))
$(eval $(call gb_Library_use_externals,vcl,\
- cairo \
- fontconfig \
- freetype \
- expat \
+ cairo \
+ fontconfig \
+ freetype \
+ expat \
))
endif
@@ -700,12 +700,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/ios/dummies \
$(vcl_really_generic_code) \
$(vcl_coretext_code) \
- $(vcl_quartz_code) \
- $(vcl_headless_code) \
+ $(vcl_quartz_code) \
+ $(vcl_headless_code) \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
- UIKit \
- CoreFoundation \
+ UIKit \
+ CoreFoundation \
))
endif
@@ -713,9 +713,9 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,vcl,\
- vcl/opengl/win/gdiimpl \
- vcl/opengl/win/WinDeviceInfo \
- vcl/opengl/win/blocklist_parser \
+ vcl/opengl/win/gdiimpl \
+ vcl/opengl/win/WinDeviceInfo \
+ vcl/opengl/win/blocklist_parser \
vcl/win/app/saldata \
vcl/win/app/salinfo \
vcl/win/app/salinst \
@@ -739,20 +739,20 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
))
$(eval $(call gb_Library_use_system_win32_libs,vcl,\
- advapi32 \
- crypt32 \
- gdi32 \
- gdiplus \
- imm32 \
- mpr \
- ole32 \
- shell32 \
- usp10 \
- uuid \
- version \
- winspool \
- setupapi \
- shlwapi \
+ advapi32 \
+ crypt32 \
+ gdi32 \
+ gdiplus \
+ imm32 \
+ mpr \
+ ole32 \
+ shell32 \
+ usp10 \
+ uuid \
+ version \
+ winspool \
+ setupapi \
+ shlwapi \
))
$(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
@@ -766,7 +766,7 @@ endif
ifeq ($(ENABLE_QT5),TRUE)
$(eval $(call gb_Library_use_externals,vcl,\
- qt5 \
+ qt5 \
))
$(eval $(call gb_Library_add_defs,vcl,\
$(QT5_CFLAGS) \
More information about the Libreoffice-commits
mailing list