summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-10-23 10:02:21 +0200
committerDavid Tardon <dtardon@redhat.com>2016-10-23 20:13:21 +0200
commitf595e426e3b715fe110a90edca3cadfa97fa72cb (patch)
treed24168043fe6020540f8d411c8b2ab26dfb46ee8
parent525311b0d6db11f247097fe76d1b2967966cf669 (diff)
cond. build is already handled in Module_external.mk
Change-Id: I5efe3bafc4f0b97578a75dc1f43e6c130a93bc4a
-rw-r--r--external/glm/Module_glm.mk4
-rw-r--r--external/hyphen/Module_hyphen.mk4
-rw-r--r--external/jpeg/Module_jpeg.mk4
-rw-r--r--external/libatomic_ops/Module_libatomic_ops.mk4
-rw-r--r--external/libpng/Module_libpng.mk4
-rw-r--r--external/nss/Module_nss.mk2
-rw-r--r--external/openldap/Module_openldap.mk4
-rw-r--r--external/openssl/Module_openssl.mk2
-rw-r--r--external/poppler/Module_poppler.mk4
-rw-r--r--external/postgresql/Module_postgresql.mk4
-rw-r--r--external/python3/Module_python3.mk2
-rw-r--r--external/python33/Module_python33.mk2
-rw-r--r--external/redland/Module_redland.mk2
-rw-r--r--external/zlib/Module_zlib.mk4
14 files changed, 0 insertions, 46 deletions
diff --git a/external/glm/Module_glm.mk b/external/glm/Module_glm.mk
index e9ab006fba83..617b067a2cff 100644
--- a/external/glm/Module_glm.mk
+++ b/external/glm/Module_glm.mk
@@ -9,12 +9,8 @@
$(eval $(call gb_Module_Module,glm))
-ifeq ($(SYSTEM_GLM),)
-
$(eval $(call gb_Module_add_targets,glm,\
UnpackedTarball_glm \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk
index 5d32fb8f9b21..527def321559 100644
--- a/external/hyphen/Module_hyphen.mk
+++ b/external/hyphen/Module_hyphen.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,hyphen))
-ifeq ($(SYSTEM_HYPH),)
-
$(eval $(call gb_Module_add_targets,hyphen,\
UnpackedTarball_hyphen \
))
@@ -29,6 +27,4 @@ $(eval $(call gb_Module_add_targets,hyphen,\
endif # $(COM)
-endif # $(SYSTEM_HYPH)
-
# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/Module_jpeg.mk b/external/jpeg/Module_jpeg.mk
index 0b45932d54f3..3d66f8f87b67 100644
--- a/external/jpeg/Module_jpeg.mk
+++ b/external/jpeg/Module_jpeg.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,jpeg))
-ifeq ($(SYSTEM_JPEG),)
-
$(eval $(call gb_Module_add_targets,jpeg,\
UnpackedTarball_jpeg \
StaticLibrary_jpeg \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk
index 2ea7e546be66..7dca6703c868 100644
--- a/external/libatomic_ops/Module_libatomic_ops.mk
+++ b/external/libatomic_ops/Module_libatomic_ops.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libatomic_ops))
-ifeq ($(SYSTEM_LIBATOMIC_OPS),)
-
$(eval $(call gb_Module_add_targets,libatomic_ops,\
ExternalProject_libatomic_ops \
UnpackedTarball_libatomic_ops \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk
index 31610d3db2fb..afb0016fbaf4 100644
--- a/external/libpng/Module_libpng.mk
+++ b/external/libpng/Module_libpng.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libpng))
-ifeq ($(SYSTEM_LIBPNG),)
-
$(eval $(call gb_Module_add_targets,libpng,\
StaticLibrary_png \
UnpackedTarball_png \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/Module_nss.mk b/external/nss/Module_nss.mk
index c1e1ab2bc074..69b39f59ee5d 100644
--- a/external/nss/Module_nss.mk
+++ b/external/nss/Module_nss.mk
@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,nss))
-ifeq ($(SYSTEM_NSS),)
ifeq ($(filter ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,nss,\
UnpackedTarball_nss \
@@ -17,6 +16,5 @@ $(eval $(call gb_Module_add_targets,nss,\
ExternalProject_nss \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk
index c9203b472e78..c6a22bc4eae2 100644
--- a/external/openldap/Module_openldap.mk
+++ b/external/openldap/Module_openldap.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,openldap))
-ifeq ($(SYSTEM_OPENLDAP),)
-
$(eval $(call gb_Module_add_targets,openldap,\
ExternalProject_openldap \
UnpackedTarball_openldap \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/openssl/Module_openssl.mk b/external/openssl/Module_openssl.mk
index 002b7083af0f..7a03fe5364e5 100644
--- a/external/openssl/Module_openssl.mk
+++ b/external/openssl/Module_openssl.mk
@@ -9,12 +9,10 @@
$(eval $(call gb_Module_Module,openssl))
-ifeq ($(SYSTEM_OPENSSL),)
$(eval $(call gb_Module_add_targets,openssl,\
UnpackedTarball_openssl \
ExternalPackage_openssl \
ExternalProject_openssl \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/Module_poppler.mk b/external/poppler/Module_poppler.mk
index 357bc6dd365e..9e9f540531c2 100644
--- a/external/poppler/Module_poppler.mk
+++ b/external/poppler/Module_poppler.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,poppler))
-ifeq ($(SYSTEM_POPPLER),)
-
$(eval $(call gb_Module_add_targets,poppler,\
ExternalProject_poppler \
UnpackedTarball_poppler \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/postgresql/Module_postgresql.mk b/external/postgresql/Module_postgresql.mk
index c57260de8909..1f655c6e5034 100644
--- a/external/postgresql/Module_postgresql.mk
+++ b/external/postgresql/Module_postgresql.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,postgresql))
-ifeq ($(SYSTEM_POSTGRESQL),)
-
$(eval $(call gb_Module_add_targets,postgresql,\
ExternalProject_postgresql \
UnpackedTarball_postgresql \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/python3/Module_python3.mk b/external/python3/Module_python3.mk
index 65e13567f7ab..5ef1deb216c5 100644
--- a/external/python3/Module_python3.mk
+++ b/external/python3/Module_python3.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE)
-ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \
@@ -19,6 +18,5 @@ $(eval $(call gb_Module_add_targets,python3,\
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/python33/Module_python33.mk b/external/python33/Module_python33.mk
index 65e13567f7ab..5ef1deb216c5 100644
--- a/external/python33/Module_python33.mk
+++ b/external/python33/Module_python33.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE)
-ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \
@@ -19,6 +18,5 @@ $(eval $(call gb_Module_add_targets,python3,\
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/redland/Module_redland.mk b/external/redland/Module_redland.mk
index 645e4193d827..adc81b462a9b 100644
--- a/external/redland/Module_redland.mk
+++ b/external/redland/Module_redland.mk
@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,redland))
-ifeq ($(SYSTEM_REDLAND),)
$(eval $(call gb_Module_add_targets,redland,\
UnpackedTarball_raptor \
UnpackedTarball_rasqal \
@@ -31,6 +30,5 @@ $(eval $(call gb_Module_add_targets,redland,\
ExternalProject_redland \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk
index 8f71c506d476..468cb2dea9fb 100644
--- a/external/zlib/Module_zlib.mk
+++ b/external/zlib/Module_zlib.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,zlib))
-ifeq ($(SYSTEM_ZLIB),)
-
$(eval $(call gb_Module_add_targets,zlib,\
StaticLibrary_zlib \
UnpackedTarball_zlib \
@@ -22,6 +20,4 @@ $(eval $(call gb_Module_add_targets,zlib,\
))
endif
-endif
-
# vim: set noet sw=4 ts=4: