Kaydet (Commit) 30e1b611 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

No point with these executables for non-desktop OSes

Change-Id: If2e086cf2783c187f2cdb479608aa91561e0d674
üst caac7011
......@@ -35,11 +35,13 @@ $(eval $(call gb_Module_add_targets,cpputools,\
StaticLibrary_uno \
))
else
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,cpputools,\
Executable_regcomp \
Executable_regsingleton \
Executable_uno \
))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,cpputools,\
......
......@@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,filter,\
AllLangResTarget_xsltdlg \
Configuration_filter \
CustomTarget_svg \
Executable_svg2odf \
Library_PptImporter \
Library_egi \
Library_eme \
......@@ -69,6 +68,12 @@ $(eval $(call gb_Module_add_targets,filter,\
Package_xslt \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,filter,\
Executable_svg2odf \
))
endif
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,filter,\
Jar_XSLTFilter \
......
......@@ -8,6 +8,9 @@
#
$(eval $(call gb_Module_Module,idlc))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,idlc,Executable_idlc))
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
......@@ -42,10 +42,12 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
))
ifneq ($(OS),MACOSX)
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,jvmfwk,\
Executable_javaldx \
))
endif
endif
endif
......
......@@ -31,8 +31,6 @@ $(eval $(call gb_Module_Module,sal))
$(eval $(call gb_Module_add_targets,sal,\
CustomTarget_generated \
CustomTarget_sal_allheaders \
$(if $(filter $(OS),IOS),, \
Executable_osl_process_child) \
Executable_cppunittester \
$(if $(filter $(OS),ANDROID), \
Library_lo-bootstrap) \
......@@ -46,6 +44,13 @@ $(eval $(call gb_Module_add_targets,sal,\
StaticLibrary_salcpprt \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,sal,\
Executable_osl_process_child \
CppunitTest_sal_osl_process \
))
endif
$(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_Module_DLL \
CppunitTest_sal_bytesequence \
......@@ -57,8 +62,6 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_osl_old_test_file \
CppunitTest_sal_osl_security \
CppunitTest_sal_osl_thread \
$(if $(filter $(OS),IOS),, \
CppunitTest_sal_osl_process) \
CppunitTest_sal_rtl_alloc \
CppunitTest_sal_rtl_cipher \
CppunitTest_sal_rtl_crc32 \
......
......@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_targets,svx,\
Package_sdi \
))
ifneq ($(OS),IOS)
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal.bin \
Package_gengal \
......
......@@ -11,7 +11,12 @@ $(eval $(call gb_Module_Module,ucpp))
$(eval $(call gb_Module_add_targets,ucpp,\
CustomTarget_source \
))
ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Module_add_targets,ucpp,\
Executable_ucpp \
))
endif
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment