From: Henri Vasserman <redacted>
Date: Tue, 4 Jul 2023 12:38:04 +0000 (+0300)
Subject: Allow old Make to build server. (#2098)
X-Git-Tag: gguf-v0.4.0~524
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=acc111caf93fc6681450924df9f99679c384c59e;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Allow old Make to build server. (#2098)

Also make server build by default.

Tested with Make 3.82
---

diff --git a/Makefile b/Makefile
index b289d97e..8966a359 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,5 @@
 # Define the default target now so that it is always the first target
-BUILD_TARGETS = main quantize quantize-stats perplexity embedding vdot train-text-from-scratch simple libembdinput.so embd-input-test
-
-ifdef LLAMA_BUILD_SERVER
-	BUILD_TARGETS += server
-	LLAMA_SERVER_VERBOSE ?= 1
-server: private CXXFLAGS += -DSERVER_VERBOSE=$(LLAMA_SERVER_VERBOSE)
-endif
+BUILD_TARGETS = main quantize quantize-stats perplexity embedding vdot train-text-from-scratch simple server libembdinput.so embd-input-test
 
 default: $(BUILD_TARGETS)
 
@@ -61,6 +55,10 @@ else
 	CXXFLAGS += -DNDEBUG
 endif
 
+ifdef LLAMA_SERVER_VERBOSE
+	CXXFLAGS += -DSERVER_VERBOSE=$(LLAMA_SERVER_VERBOSE)
+endif
+
 # warnings
 CFLAGS   += -Wall -Wextra -Wpedantic -Wcast-qual -Wdouble-promotion -Wshadow -Wstrict-prototypes -Wpointer-arith
 CXXFLAGS += -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function -Wno-multichar