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
90
91
92
93
94
|
From: Andrej Shadura <andrewsh@debian.org>
Date: Mon, 4 Jan 2021 19:21:03 +0100
Subject: Fix Makefiles to use system compiler settings
---
src/osdctl/Makefile | 7 +++----
src/osdsh/Makefile | 31 +++++++++++++------------------
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/osdctl/Makefile b/src/osdctl/Makefile
index cf2bb66..e670a2a 100644
--- a/src/osdctl/Makefile
+++ b/src/osdctl/Makefile
@@ -1,17 +1,16 @@
-CC = gcc
+CC ?= gcc
PREFIX = /usr
BINDIR = $(PREFIX)/bin
DOCDIR = $(PREFIX)/doc/osdsh
LIBDIR = -L/usr/X11R6/lib -L/usr/lib
LIBS = $(LIBDIR)
-CFLAGS = -O3
all: osdctl
osdctl:
- gcc $(LIBDIR) $(LIBS) $(CFLAGS) -o $@ $@.c
+ $(CC) $(LIBDIR) $(LIBS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $@.c
-clean:
+clean:
rm -f osdctl
diff --git a/src/osdsh/Makefile b/src/osdsh/Makefile
index 320651b..5c161f9 100644
--- a/src/osdsh/Makefile
+++ b/src/osdsh/Makefile
@@ -1,10 +1,10 @@
-CC = gcc
+CC ?= gcc
PREFIX = /usr
BINDIR = $(PREFIX)/bin
DOCDIR = $(PREFIX)/doc/osdsh
LIBDIR = -L/usr/X11R6/lib -L/usr/lib
LIBS = $(LIBDIR) -lxosd -lpthread
-CFLAGS = -O3 -rdynamic
+CFLAGS += -rdynamic
#APMOBJS = apmwatch.o
#APMLIBS = -lapm
@@ -17,12 +17,11 @@ all: osdsh libs
libs: libosdshclock.so libosdshmixer.so libosdshnet.so
%.o: %.c
-
- gcc -fPIC -c $<
+ $(CC) -fPIC -c $(CFLAGS) $(CPPFLAGS) $<
osdsh: $(OBJS)
- gcc -c $(CFLAGS) $@.c
- gcc $(CFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $@.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl
clean: libclean
rm -f osdsh
@@ -31,18 +30,14 @@ clean: libclean
libclean:
rm -f libosdsh*.so
-libosdshclock.so:
- gcc -fPIC -c clockdisplay.c
- gcc -shared -o $@ clockdisplay.o utils.o
+libosdshclock.so: clockdisplay.o
+ $(CC) -shared $(LDFLAGS) -o $@ clockdisplay.o utils.o
-libosdshmixer.so:
- gcc -fPIC -c mixerwatch.c
- gcc -shared -o $@ mixerwatch.o utils.o
+libosdshmixer.so: mixerwatch.o
+ $(CC) -shared $(LDFLAGS) -o $@ mixerwatch.o utils.o
-libosdshapm.so:
- gcc -fPIC -c apmwatch.c
- gcc -shared -o $@ apmwatch.o utils.o -lapm
+libosdshapm.so: apmwatch.o utils.o
+ $(CC) -shared $(LDFLAGS) -o $@ apmwatch.o utils.o -lapm
-libosdshnet.so:
- gcc -fPIC -c connectionwatch.c
- gcc -shared -o $@ connectionwatch.o utils.o
+libosdshnet.so: connectionwatch.o utils.o
+ $(CC) -shared $(LDFLAGS) -o $@ connectionwatch.o utils.o
|
