Merge pull request #205 from squeek502/make-shared

Add regular-shared make target for shared openssl
luvit · Mar 30, 2019 · 532a943 · 532a943
2 parents 005c4b8 + 15efecc
commit 532a943
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,6 @@ ifdef WITHOUT_AMALG
 endif
 
 WITH_SHARED_LIBLUV ?= OFF
-SHAREDSSL ?= OFF
 
 CMAKE_FLAGS += \
 	-DWithSharedLibluv=$(WITH_SHARED_LIBLUV)
@@ -65,10 +64,14 @@ tiny: deps/luv/CMakeLists.txt
 
 # Configure the build with openssl statically included
 regular: deps/luv/CMakeLists.txt
-	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=$(SHAREDSSL) -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
+	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
 
 regular-asm: deps/luv/CMakeLists.txt
-	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=$(SHAREDSSL) -DWithOpenSSLASM=ON -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
+	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithOpenSSLASM=ON -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
+
+# Configure the build with shared openssl
+regular-shared:
+	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=ON -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
 
 package: deps/luv/CMakeLists.txt
 	cmake --build build -- package