mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cond. build is already handled in Module_external.mk

Browse Source 
Change-Id: I5efe3bafc4f0b97578a75dc1f43e6c130a93bc4a
This commit is contained in:
David Tardon
2016-10-23 10:02:21 +02:00
parent 525311b0d6
commit f595e426e3
14 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/glm/Module_glm.mk vendored
View File

@@ -9,12 +9,8 @@
$(eval $(call gb_Module_Module,glm)) $(eval $(call gb_Module_Module,glm))
ifeq ($(SYSTEM_GLM),)
$(eval $(call gb_Module_add_targets,glm,\ $(eval $(call gb_Module_add_targets,glm,\
UnpackedTarball_glm \ UnpackedTarball_glm \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/hyphen/Module_hyphen.mk vendored
View File

@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,hyphen)) $(eval $(call gb_Module_Module,hyphen))
ifeq ($(SYSTEM_HYPH),)
$(eval $(call gb_Module_add_targets,hyphen,\ $(eval $(call gb_Module_add_targets,hyphen,\
UnpackedTarball_hyphen \ UnpackedTarball_hyphen \
)) ))
@@ -29,6 +27,4 @@ $(eval $(call gb_Module_add_targets,hyphen,\
endif # $(COM) endif # $(COM)
endif # $(SYSTEM_HYPH)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/jpeg/Module_jpeg.mk vendored
View File

@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,jpeg)) $(eval $(call gb_Module_Module,jpeg))
ifeq ($(SYSTEM_JPEG),)
$(eval $(call gb_Module_add_targets,jpeg,\ $(eval $(call gb_Module_add_targets,jpeg,\
UnpackedTarball_jpeg \ UnpackedTarball_jpeg \
StaticLibrary_jpeg \ StaticLibrary_jpeg \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/libatomic_ops/Module_libatomic_ops.mk vendored
View File

@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libatomic_ops)) $(eval $(call gb_Module_Module,libatomic_ops))
ifeq ($(SYSTEM_LIBATOMIC_OPS),)
$(eval $(call gb_Module_add_targets,libatomic_ops,\ $(eval $(call gb_Module_add_targets,libatomic_ops,\
ExternalProject_libatomic_ops \ ExternalProject_libatomic_ops \
UnpackedTarball_libatomic_ops \ UnpackedTarball_libatomic_ops \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/libpng/Module_libpng.mk vendored
View File

@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libpng)) $(eval $(call gb_Module_Module,libpng))
ifeq ($(SYSTEM_LIBPNG),)
$(eval $(call gb_Module_add_targets,libpng,\ $(eval $(call gb_Module_add_targets,libpng,\
StaticLibrary_png \ StaticLibrary_png \
UnpackedTarball_png \ UnpackedTarball_png \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
external/nss/Module_nss.mk vendored
View File

@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,nss)) $(eval $(call gb_Module_Module,nss))
ifeq ($(SYSTEM_NSS),)
ifeq ($(filter ANDROID,$(OS)),) ifeq ($(filter ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,nss,\ $(eval $(call gb_Module_add_targets,nss,\
UnpackedTarball_nss \ UnpackedTarball_nss \
@@ -17,6 +16,5 @@ $(eval $(call gb_Module_add_targets,nss,\
ExternalProject_nss \ ExternalProject_nss \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/openldap/Module_openldap.mk vendored
View File

@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,openldap)) $(eval $(call gb_Module_Module,openldap))
ifeq ($(SYSTEM_OPENLDAP),)
$(eval $(call gb_Module_add_targets,openldap,\ $(eval $(call gb_Module_add_targets,openldap,\
ExternalProject_openldap \ ExternalProject_openldap \
UnpackedTarball_openldap \ UnpackedTarball_openldap \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
external/openssl/Module_openssl.mk vendored
View File

@@ -9,12 +9,10 @@
$(eval $(call gb_Module_Module,openssl)) $(eval $(call gb_Module_Module,openssl))
ifeq ($(SYSTEM_OPENSSL),)
$(eval $(call gb_Module_add_targets,openssl,\ $(eval $(call gb_Module_add_targets,openssl,\
UnpackedTarball_openssl \ UnpackedTarball_openssl \
ExternalPackage_openssl \ ExternalPackage_openssl \
ExternalProject_openssl \ ExternalProject_openssl \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/poppler/Module_poppler.mk vendored
View File

@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,poppler)) $(eval $(call gb_Module_Module,poppler))
ifeq ($(SYSTEM_POPPLER),)
$(eval $(call gb_Module_add_targets,poppler,\ $(eval $(call gb_Module_add_targets,poppler,\
ExternalProject_poppler \ ExternalProject_poppler \
UnpackedTarball_poppler \ UnpackedTarball_poppler \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/postgresql/Module_postgresql.mk vendored
View File

@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,postgresql)) $(eval $(call gb_Module_Module,postgresql))
ifeq ($(SYSTEM_POSTGRESQL),)
$(eval $(call gb_Module_add_targets,postgresql,\ $(eval $(call gb_Module_add_targets,postgresql,\
ExternalProject_postgresql \ ExternalProject_postgresql \
UnpackedTarball_postgresql \ UnpackedTarball_postgresql \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
external/python3/Module_python3.mk vendored
View File

@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,python3)) $(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE) ifneq ($(DISABLE_PYTHON),TRUE)
ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\ $(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \ UnpackedTarball_python3 \
@@ -18,7 +17,6 @@ $(eval $(call gb_Module_add_targets,python3,\
$(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \
)) ))
endif
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
external/python33/Module_python33.mk vendored
View File

@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,python3)) $(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE) ifneq ($(DISABLE_PYTHON),TRUE)
ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\ $(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \ UnpackedTarball_python3 \
@@ -18,7 +17,6 @@ $(eval $(call gb_Module_add_targets,python3,\
$(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \
)) ))
endif
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
external/redland/Module_redland.mk vendored
View File

@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,redland)) $(eval $(call gb_Module_Module,redland))
ifeq ($(SYSTEM_REDLAND),)
$(eval $(call gb_Module_add_targets,redland,\ $(eval $(call gb_Module_add_targets,redland,\
UnpackedTarball_raptor \ UnpackedTarball_raptor \
UnpackedTarball_rasqal \ UnpackedTarball_rasqal \
@@ -31,6 +30,5 @@ $(eval $(call gb_Module_add_targets,redland,\
ExternalProject_redland \ ExternalProject_redland \
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
external/zlib/Module_zlib.mk vendored
View File

@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,zlib)) $(eval $(call gb_Module_Module,zlib))
ifeq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Module_add_targets,zlib,\ $(eval $(call gb_Module_add_targets,zlib,\
StaticLibrary_zlib \ StaticLibrary_zlib \
UnpackedTarball_zlib \ UnpackedTarball_zlib \
@@ -22,6 +20,4 @@ $(eval $(call gb_Module_add_targets,zlib,\
)) ))
endif endif
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: