1. mst
  2. ooo340

Commits

Michael Stahl  committed 8df8096

gnumake4: #i117610#: move openssl to RepositoryExternal.mk

  • Participants
  • Parent commits 140bf9b
  • Branches default

Comments (0)

Files changed (4)

File Repository.mk

View file
  • Ignore whitespace
     vclmain \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    crypto \
-    ssl \
-))
-else
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-    crypto \
-    ssl \
-))
-endif
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-	crypto \
-	ssl \
-))
-endif
-
 # vim: set noet sw=4 ts=4:

File RepositoryExternal.mk

View file
  • Ignore whitespace
 
 endif # SYSTEM_ICU
 
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+
+define gb_LinkTarget__use_openssl
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(OPENSSL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+endef
+
+else # !SYSTEM_OPENSSL
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    crypto \
+    ssl \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    crypto \
+    ssl \
+))
+endif
+
+define gb_LinkTarget__use_openssl
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	crypto \
+	ssl \
+)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	crypto \
+	ssl \
+)
+ifeq ($(OS),SOLARIS)
+$(call gb_LinkTarget_add_libs,$(1),\
+	-lnsl \
+	-lsocket \
+)
+endif
+endif
+endef
+
+endif # SYSTEM_OPENSSL
+
+
 # vim: set noet sw=4 ts=4:

File RepositoryFixes.mk

View file
  • Ignore whitespace
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
 endif
 
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_StaticLibrary_TARGETS := $(filter-out crypto,$(gb_StaticLibrary_TARGETS))
-gb_StaticLibrary_TARGETS := $(filter-out ssl,$(gb_StaticLibrary_TARGETS))
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
 # vim: set noet sw=4 ts=4:

File oox/Library_oox.mk

View file
  • Ignore whitespace
 	$(gb_STDLIBS) \
 ))
 
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Library_add_linked_libs,oox,\
-	crypto \
-	ssl \
-))
-else
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,oox,\
-	crypto \
-	ssl \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,oox,\
-	crypto \
-	ssl \
-))
-endif
-endif
-
-# this is for openssl
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_linked_libs,oox,\
-	nsl \
-	socket \
-))
-endif
-#probably not necessary:	dl \
+$(call gb_Library_use_external,oox,openssl)
 
 # object files ----------------------------------------------------------------