| 1 |
https://gitlab.com/compiz/compiz-boxmenu/-/merge_requests/6 |
| 2 |
|
| 3 |
commit 8329d7a8c335bfb726a6855d1a7449b96114805b |
| 4 |
Author: Samuel Thibault <[email protected]> |
| 5 |
Date: Wed Dec 30 16:12:56 2020 +0100 |
| 6 |
|
| 7 |
Fix letting user define CFLAGS/CPPFLAGS/LDFLAGS |
| 8 |
|
| 9 |
So that distributions can enable hardening flags etc. |
| 10 |
|
| 11 |
--- |
| 12 |
Makefile | 15 +++++++++------ |
| 13 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
--- a/Makefile |
| 16 |
+++ b/Makefile |
| 17 |
@@ -17,16 +17,19 @@ $(error Python not found. Version >= 2.7 |
| 18 |
endif |
| 19 |
|
| 20 |
# Set up compile flags |
| 21 |
-CPPFLAGS := `$(PKG_CONFIG) --cflags dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0` |
| 22 |
-CPPFLAGS_CLIENT := `$(PKG_CONFIG) --cflags dbus-glib-1` |
| 23 |
+CPPFLAGS ?= |
| 24 |
+CPPFLAGS_CLIENT := $(CPPFLAGS) `$(PKG_CONFIG) --cflags dbus-glib-1` |
| 25 |
+CPPFLAGS += `$(PKG_CONFIG) --cflags dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0` |
| 26 |
WARNINGS := -Wall -Wextra -Wno-unused-parameter |
| 27 |
ifneq ("$(DEBUG)","") |
| 28 |
- CFLAGS := -O2 -g $(WARNINGS) |
| 29 |
+ CFLAGS ?= -O2 -g |
| 30 |
else |
| 31 |
- CFLAGS := $(WARNINGS) |
| 32 |
+ CFLAGS ?= |
| 33 |
endif |
| 34 |
-LDFLAGS := -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0` |
| 35 |
-LDFLAGS_CLIENT := -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1` |
| 36 |
+CFLAGS += $(WARNINGS) |
| 37 |
+LDFLAGS ?= |
| 38 |
+LDFLAGS_CLIENT := $(LDFLAGS) -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1` |
| 39 |
+LDFLAGS += -Wl,--as-needed `$(PKG_CONFIG) --libs dbus-glib-1 gdk-3.0 gtk+-3.0 libwnck-3.0` |
| 40 |
|
| 41 |
VERSION=1.1.12 |
| 42 |
|