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
|
https://gitlab.com/compiz/compiz-boxmenu/-/merge_requests/6
commit 8329d7a8c335bfb726a6855d1a7449b96114805b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Dec 30 16:12:56 2020 +0100
Fix letting user define CFLAGS/CPPFLAGS/LDFLAGS
So that distributions can enable hardening flags etc.
---
Makefile | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -17,16 +17,19 @@ $(error Python not found. Version >= 2.7
endif
# Set up compile flags
-CPPFLAGS := `$(PKG_CONFIG) --cflags dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0`
-CPPFLAGS_CLIENT := `$(PKG_CONFIG) --cflags dbus-glib-1`
+CPPFLAGS ?=
+CPPFLAGS_CLIENT := $(CPPFLAGS) `$(PKG_CONFIG) --cflags dbus-glib-1`
+CPPFLAGS += `$(PKG_CONFIG) --cflags dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0`
WARNINGS := -Wall -Wextra -Wno-unused-parameter
ifneq ("$(DEBUG)","")
- CFLAGS := -O2 -g $(WARNINGS)
+ CFLAGS ?= -O2 -g
else
- CFLAGS := $(WARNINGS)
+ CFLAGS ?=
endif
-LDFLAGS := -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0`
-LDFLAGS_CLIENT := -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1`
+CFLAGS += $(WARNINGS)
+LDFLAGS ?=
+LDFLAGS_CLIENT := $(LDFLAGS) -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1`
+LDFLAGS += -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0`
VERSION=1.1.12
|
