| Patrick Williams | e760df8 | 2023-05-26 11:10:49 -0500 | [diff] [blame] | 1 | From ac72fffe639d564f59ec1e1eafde83980acef1b5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 23 May 2023 14:40:31 -0700 |
| 4 | Subject: [PATCH] makefiles: Append to CFLAGS instead of re-assign |
| 5 | |
| 6 | This helps in inserting yocto provided CFLAGS from build environment |
| 7 | |
| 8 | Upstream-Status: Inappropriate [No upstream] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | jailtest/Makefile | 2 +- |
| 12 | mconsole/Makefile | 2 +- |
| 13 | moo/Makefile | 2 +- |
| 14 | port-helper/Makefile | 2 +- |
| 15 | tunctl/Makefile | 2 +- |
| 16 | uml_net/Makefile | 2 +- |
| 17 | uml_router/Makefile | 2 +- |
| 18 | watchdog/Makefile | 2 +- |
| 19 | 8 files changed, 8 insertions(+), 8 deletions(-) |
| 20 | |
| 21 | diff --git a/jailtest/Makefile b/jailtest/Makefile |
| 22 | index 610ca1a..025fca9 100644 |
| 23 | --- a/jailtest/Makefile |
| 24 | +++ b/jailtest/Makefile |
| 25 | @@ -1,6 +1,6 @@ |
| 26 | OBJS = jailtest.o |
| 27 | BIN = jailtest |
| 28 | -CFLAGS = -g -Wall |
| 29 | +CFLAGS += -g -Wall |
| 30 | |
| 31 | BIN_DIR ?= /usr/bin |
| 32 | |
| 33 | diff --git a/mconsole/Makefile b/mconsole/Makefile |
| 34 | index 9818d8a..74a2560 100644 |
| 35 | --- a/mconsole/Makefile |
| 36 | +++ b/mconsole/Makefile |
| 37 | @@ -1,6 +1,6 @@ |
| 38 | BIN = uml_mconsole |
| 39 | OBJS = $(BIN).o |
| 40 | -CFLAGS = -g -Wall |
| 41 | +CFLAGS += -g -Wall |
| 42 | |
| 43 | BIN_DIR ?= /usr/bin |
| 44 | |
| 45 | diff --git a/moo/Makefile b/moo/Makefile |
| 46 | index 6cdb591..60d300d 100644 |
| 47 | --- a/moo/Makefile |
| 48 | +++ b/moo/Makefile |
| 49 | @@ -3,7 +3,7 @@ BIN = uml_moo uml_mkcow |
| 50 | uml_moo_OBJS = uml_moo.o cow.o |
| 51 | uml_mkcow_OBJS = uml_mkcow.o cow.o |
| 52 | |
| 53 | -CFLAGS = -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE |
| 54 | +CFLAGS += -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE |
| 55 | |
| 56 | BIN_DIR ?= /usr/bin |
| 57 | |
| 58 | diff --git a/port-helper/Makefile b/port-helper/Makefile |
| 59 | index 8e33bdf..8b695f3 100644 |
| 60 | --- a/port-helper/Makefile |
| 61 | +++ b/port-helper/Makefile |
| 62 | @@ -1,6 +1,6 @@ |
| 63 | OBJS = port-helper.o |
| 64 | BIN = port-helper |
| 65 | -CFLAGS = -g -Wall |
| 66 | +CFLAGS += -g -Wall |
| 67 | |
| 68 | LIB_DIR ?= /usr/lib/uml |
| 69 | |
| 70 | diff --git a/tunctl/Makefile b/tunctl/Makefile |
| 71 | index 743bfea..a39ad2b 100644 |
| 72 | --- a/tunctl/Makefile |
| 73 | +++ b/tunctl/Makefile |
| 74 | @@ -1,6 +1,6 @@ |
| 75 | OBJS = tunctl.o |
| 76 | BIN = tunctl |
| 77 | -CFLAGS = -g -Wall |
| 78 | +CFLAGS += -g -Wall |
| 79 | |
| 80 | BIN_DIR ?= /usr/bin |
| 81 | |
| 82 | diff --git a/uml_net/Makefile b/uml_net/Makefile |
| 83 | index 36efec6..2e1ad0e 100644 |
| 84 | --- a/uml_net/Makefile |
| 85 | +++ b/uml_net/Makefile |
| 86 | @@ -1,7 +1,7 @@ |
| 87 | TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) |
| 88 | |
| 89 | BIN = uml_net |
| 90 | -CFLAGS = -g -Wall $(TUNTAP) |
| 91 | +CFLAGS += -g -Wall $(TUNTAP) |
| 92 | |
| 93 | BIN_DIR ?= /usr/bin |
| 94 | |
| 95 | diff --git a/uml_router/Makefile b/uml_router/Makefile |
| 96 | index b7b5401..e399ea5 100644 |
| 97 | --- a/uml_router/Makefile |
| 98 | +++ b/uml_router/Makefile |
| 99 | @@ -2,7 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) |
| 100 | |
| 101 | OBJS = hash.o port.o uml_switch.o |
| 102 | BIN = uml_switch |
| 103 | -CFLAGS = -g -Wall $(TUNTAP) |
| 104 | +CFLAGS += -g -Wall $(TUNTAP) |
| 105 | |
| 106 | BIN_DIR ?= /usr/bin |
| 107 | |
| 108 | diff --git a/watchdog/Makefile b/watchdog/Makefile |
| 109 | index c26fd9f..5178cc6 100644 |
| 110 | --- a/watchdog/Makefile |
| 111 | +++ b/watchdog/Makefile |
| 112 | @@ -1,6 +1,6 @@ |
| 113 | BIN = uml_watchdog |
| 114 | OBJS = $(BIN).o |
| 115 | -CFLAGS = -g -Wall |
| 116 | +CFLAGS += -g -Wall |
| 117 | |
| 118 | BIN_DIR ?= /usr/bin |
| 119 | |
| 120 | -- |
| 121 | 2.40.1 |
| 122 | |