1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From b4e232dbad5d48048d391e78c749623f800cecdf Mon Sep 17 00:00:00 2001
From: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date: Tue, 24 Oct 2023 13:17:25 +0200
Subject: [PATCH] GNUmakefile: Replace .so with .a
---
GNUmakefile | 6 +++---
util-src/GNUmakefile | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index e9ec78c4e..3b37382ff 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -56,12 +56,12 @@ install-net:
$(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
$(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
-install-util: util/encodings.so util/encodings.so util/pposix.so util/signal.so util/struct.so
+install-util: util/encodings.a util/encodings.a util/pposix.a util/signal.a util/struct.a
$(MKDIR) $(SOURCE)
$(MKDIR) $(SOURCE)/util
$(INSTALL_DATA) util/*.lua $(SOURCE)/util
$(MAKE) install -C util-src
- $(INSTALL_DATA) util/*.so $(SOURCE)/util
+ $(INSTALL_DATA) util/*.a $(SOURCE)/util
$(MKDIR) $(SOURCE)/util/sasl
$(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
$(MKDIR) $(SOURCE)/util/human
@@ -137,7 +137,7 @@ vpath %.tl teal-src/
teal: util/jsonschema.lua util/datamapper.lua util/jsonpointer.lua
-util/%.so:
+util/%.a:
$(MAKE) install -C util-src
%.install: %
diff --git a/util-src/GNUmakefile b/util-src/GNUmakefile
index 810f39f7e..dfb793658 100644
--- a/util-src/GNUmakefile
+++ b/util-src/GNUmakefile
@@ -6,16 +6,16 @@ CFLAGS+=-I$(LUA_INCDIR)
INSTALL_DATA=install -m644
TARGET?=../util/
-ALL=encodings.so hashes.so net.so pposix.so signal.so table.so \
- ringbuffer.so time.so poll.so compat.so strbitop.so \
- struct.so
+ALL=encodings.a hashes.a net.a pposix.a signal.a table.a \
+ ringbuffer.a time.a poll.a compat.a strbitop.a \
+ struct.a
ifdef RANDOM
-ALL+=crand.so
+ALL+=crand.a
endif
.PHONY: all install clean
-.SUFFIXES: .c .o .so
+.SUFFIXES: .c .o .a
all: $(ALL)
@@ -23,15 +23,15 @@ install: $(ALL)
$(INSTALL_DATA) $? $(TARGET)
clean:
- rm -f $(ALL) $(patsubst %.so,%.o,$(ALL))
+ rm -f $(ALL) $(patsubst %.a,%.o,$(ALL))
encodings.o: CFLAGS+=$(IDNA_FLAGS)
-encodings.so: LDLIBS+=$(IDNA_LIBS)
+encodings.a: LDLIBS+=$(IDNA_LIBS)
-hashes.so: LDLIBS+=$(OPENSSL_LIBS)
+hashes.a: LDLIBS+=$(OPENSSL_LIBS)
crand.o: CFLAGS+=-DWITH_$(RANDOM)
-crand.so: LDLIBS+=$(RANDOM_LIBS)
+crand.a: LDLIBS+=$(RANDOM_LIBS)
-%.so: %.o
- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+%.a: %.o
+ $(AR) $(ARFLAGS) $@ $<
--
2.34.1
|
