Link required thirdparty libraries into one library: libmupdfthird.a

Keep the extra thirdparty libraries (curl and glfw) separate.

This matches the build process for android and win32.

Also purge some unused makefile sections.

1 files changed, 12 insertions, 74 deletions

diff --git a/Makethird b/Makethird
index d39d5c63..2f698942 100644
--- a/Makethird
+++ b/Makethird
@@ -11,51 +11,20 @@ JBIG2DEC_DIR := thirdparty/jbig2dec
 JPEG_DIR := thirdparty/jpeg
 MUJS_DIR := thirdparty/mujs
 OPENJPEG_DIR := thirdparty/openjpeg/libopenjpeg
-OPENSSL_DIR := thirdparty/openssl
 ZLIB_DIR := thirdparty/zlib
+
 CURL_DIR := thirdparty/curl
 GLFW_DIR := thirdparty/glfw
 
-# --- V8 ---
-#
-# V8 is too big to be used as a submodule.
-#
-
-V8_DIR := $(wildcard thirdparty/v8*)
-
-ifneq "$(V8_DIR)" ""
-
-ifeq "$(build)" "release"
-V8_LIB_CHOICE := release
-else ifeq "$(build)" "profile"
-V8_LIB_CHOICE := release
-else
-V8_LIB_CHOICE := debug
-endif
-
-V8_ARCH ?= x64
-
-# If you are building for 32bit linux use V8_ARCH=ia32
-ifeq "$(OS)" "Darwin"
-V8_LIBS := -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8_LIB_CHOICE)/ -lv8_base -lv8_snapshot -lstdc++
-else
-V8_LIBS := -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -ldl -lstdc++
-endif
-
-V8_CFLAGS := -I$(V8_DIR)/include
-
-HAVE_V8 := yes
-endif
-
 # --- MuJS ---
 
 ifneq "$(wildcard $(MUJS_DIR)/README)" ""
 
-MUJS_LIB := $(OUT)/libmujs.a
 MUJS_OUT := $(OUT)/mujs
 MUJS_SRC := one.c
 
-$(MUJS_LIB): $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o))
+MUJS_OBJ := $(addprefix $(MUJS_OUT)/, $(MUJS_SRC:%.c=%.o))
+
 $(MUJS_OUT):
 	$(MKDIR_CMD)
 $(MUJS_OUT)/%.o: $(MUJS_DIR)/%.c | $(MUJS_OUT)
@@ -70,7 +39,6 @@ endif
 
 ifneq "$(wildcard $(FREETYPE_DIR)/README)" ""
 
-FREETYPE_LIB := $(OUT)/libfreetype.a
 FREETYPE_OUT := $(OUT)/freetype
 FREETYPE_SRC := \
 	ftbase.c \
@@ -96,8 +64,7 @@ FREETYPE_SRC := \
 	type1.c \
 	type1cid.c \
 
-
-$(FREETYPE_LIB): $(addprefix $(FREETYPE_OUT)/, $(FREETYPE_SRC:%.c=%.o))
+FREETYPE_OBJ := $(addprefix $(FREETYPE_OUT)/, $(FREETYPE_SRC:%.c=%.o))
 
 $(FREETYPE_OUT):
 	$(MKDIR_CMD)
@@ -139,7 +106,6 @@ endif
 
 ifneq "$(wildcard $(JBIG2DEC_DIR)/README)" ""
 
-JBIG2DEC_LIB := $(OUT)/libjbig2dec.a
 JBIG2DEC_OUT := $(OUT)/jbig2dec
 JBIG2DEC_SRC := \
 	jbig2.c \
@@ -158,7 +124,8 @@ JBIG2DEC_SRC := \
 	jbig2_symbol_dict.c \
 	jbig2_text.c \
 
-$(JBIG2DEC_LIB): $(addprefix $(JBIG2DEC_OUT)/, $(JBIG2DEC_SRC:%.c=%.o))
+JBIG2DEC_OBJ := $(addprefix $(JBIG2DEC_OUT)/, $(JBIG2DEC_SRC:%.c=%.o))
+
 $(JBIG2DEC_OUT):
 	$(MKDIR_CMD)
 $(JBIG2DEC_OUT)/%.o: $(JBIG2DEC_DIR)/%.c | $(JBIG2DEC_OUT)
@@ -174,7 +141,6 @@ endif
 
 ifneq "$(wildcard $(JPEG_DIR)/README)" ""
 
-JPEG_LIB := $(OUT)/libjpeg.a
 JPEG_OUT := $(OUT)/jpeg
 JPEG_SRC := \
 	jaricom.c \
@@ -208,7 +174,8 @@ JPEG_SRC := \
 	jquant2.c \
 	jutils.c \
 
-$(JPEG_LIB): $(addprefix $(JPEG_OUT)/, $(JPEG_SRC:%.c=%.o))
+JPEG_OBJ := $(addprefix $(JPEG_OUT)/, $(JPEG_SRC:%.c=%.o))
+
 $(JPEG_OUT):
 	$(MKDIR_CMD)
 $(JPEG_OUT)/%.o: $(JPEG_DIR)/%.c | $(JPEG_OUT)
@@ -224,7 +191,6 @@ endif
 
 ifneq "$(wildcard $(OPENJPEG_DIR)/CMakeLists.txt)" ""
 
-OPENJPEG_LIB := $(OUT)/libopenjpeg.a
 OPENJPEG_OUT := $(OUT)/openjpeg
 OPENJPEG_SRC := \
 	bio.c \
@@ -252,7 +218,8 @@ OPENJPEG_SRC := \
 	thix_manager.c \
 	tpix_manager.c \
 
-$(OPENJPEG_LIB): $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o))
+OPENJPEG_OBJ := $(addprefix $(OPENJPEG_OUT)/, $(OPENJPEG_SRC:%.c=%.o))
+
 $(OPENJPEG_OUT):
 	$(MKDIR_CMD)
 $(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT)
@@ -268,7 +235,6 @@ endif
 
 ifneq "$(wildcard $(ZLIB_DIR)/README)" ""
 
-ZLIB_LIB := $(OUT)/libz.a
 ZLIB_OUT := $(OUT)/zlib
 ZLIB_SRC := \
 	adler32.c \
@@ -286,7 +252,8 @@ ZLIB_SRC := \
 	gzclose.c \
 	gzread.c \
 
-$(ZLIB_LIB): $(addprefix $(ZLIB_OUT)/, $(ZLIB_SRC:%.c=%.o))
+ZLIB_OBJ := $(addprefix $(ZLIB_OUT)/, $(ZLIB_SRC:%.c=%.o))
+
 $(ZLIB_OUT):
 	$(MKDIR_CMD)
 $(ZLIB_OUT)/%.o: $(ZLIB_DIR)/%.c | $(ZLIB_OUT)
@@ -298,34 +265,6 @@ ZLIB_CFLAGS := $(SYS_ZLIB_CFLAGS)
 ZLIB_LIBS := $(SYS_ZLIB_LIBS)
 endif
 
-# --- OpenSSL ---
-
-ifneq "$(wildcard $(OPENSSL_DIR)/README)" ""
-
-OPENSSL_LIB := $(OUT)/libcrypto.a
-
-OPENSSL_DIR_MAK := $(OPENSSL_DIR)/Makefile
-OPENSSL_DIR_LIB := $(OPENSSL_DIR)/libcrypto.a
-
-$(OPENSSL_DIR_MAK):
-	cd $(OPENSSL_DIR) && ./config no-threads no-zlib no-shared no-asm no-dso
-
-$(OPENSSL_DIR_LIB): $(OPENSSL_DIR_MAK)
-	$(MAKE) -C $(OPENSSL_DIR) build_crypto
-
-$(OPENSSL_LIB): $(OPENSSL_DIR_LIB) | $(OUT)
-	cp $(OPENSSL_DIR_LIB) $(OPENSSL_LIB)
-
-openssl-clean:
-	$(MAKE) -C $(OPENSSL_DIR) clean
-	rm -f thirdparty/openssl/Makefile thirdparty/openssl/libcrypto.a
-
-OPENSSL_CFLAGS := -DHAVE_OPENSSL -I$(OPENSSL_DIR)/include
-else
-OPENSSL_CFLAGS := $(SYS_OPENSSL_CFLAGS)
-OPENSSL_LIBS := $(SYS_OPENSSL_LIBS)
-endif
-
 # --- cURL ---
 
 ifneq "$(wildcard $(CURL_DIR)/README)" ""
@@ -443,7 +382,6 @@ CURL_SRC := \
 	warnless.c \
 	wildcard.c \
 
-
 $(CURL_LIB): $(addprefix $(CURL_OUT)/, $(CURL_SRC:%.c=%.o))
 
 $(CURL_OUT):