[PR #5478] [MERGED] build: deduplicate makefiles #5507

New issue

Closed

opened 2026-05-05 10:39:42 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:39:42 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/5478
Author: @kmk3
Created: 11/21/2022
Status: ✅ Merged
Merged: 11/25/2022
Merged by: @netblue30

Base: master ← Head: build-dedup-makefiles

📝 Commits (10+)

c208939 fids/Makefile: remove code comment
39ffe71 makefiles: remove unused BINOBJS variable
289346e lib/Makefile: put all target before include of common.mk
e8a37ca Makefile: put the all target after variables
72345b7 makefiles: include config.mk directly
85e42ed makefiles: equalize object dependencies in program targets
87db107 makefiles: rename H_FILE_LIST and C_FILE_LIST
60a95f0 makefiles: expand HDRS, SRCS and OBJS immediately
f5b1cca makefiles: move extra deps into new MOD vars
350755c makefiles: line-wrap MOD_HDRS and MOD_OBJS

📊 Changes

28 files changed (+213 additions, -350 deletions)

View changed files

📝 Makefile (+4 -2)
➖ src/common.mk (+0 -16)
📝 src/fbuilder/Makefile (+5 -13)
📝 src/fcopy/Makefile (+6 -13)
📝 src/fids/Makefile (+5 -14)
📝 src/firecfg/Makefile (+11 -12)
📝 src/firejail/Makefile (+20 -12)
📝 src/firemon/Makefile (+6 -13)
📝 src/fldd/Makefile (+6 -13)
📝 src/fnet/Makefile (+6 -13)
📝 src/fnetfilter/Makefile (+6 -13)
📝 src/fnettrace-dns/Makefile (+4 -14)
📝 src/fnettrace-icmp/Makefile (+4 -14)
📝 src/fnettrace-sni/Makefile (+4 -14)
📝 src/fnettrace/Makefile (+4 -14)
📝 src/fsec-optimize/Makefile (+6 -13)
📝 src/fsec-print/Makefile (+6 -13)
📝 src/fseccomp/Makefile (+6 -13)
📝 src/ftee/Makefile (+4 -14)
📝 src/fzenity/Makefile (+5 -13)

...and 8 more files

📄 Description

Main commits:

makefiles: include config.mk directly
makefiles: equalize object dependencies in program targets
makefiles: rename H_FILE_LIST and C_FILE_LIST
makefiles: expand HDRS, SRCS and OBJS immediately
makefiles: move extra deps into new MOD vars
makefiles: deduplicate main target name into new PROG var
makefiles: deduplicate many makefiles into common.mk
makefiles: deduplicate main target name into new SO var
makefiles: deduplicate lib makefiles into so.mk
makefiles: rename common.mk to prog.mk
makefiles: organize CFLAGS

This is kind of a continuation of #5140 and #5219.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/5478 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 11/21/2022 **Status:** ✅ Merged **Merged:** 11/25/2022 **Merged by:** [@netblue30](https://github.com/netblue30) **Base:** `master` ← **Head:** `build-dedup-makefiles` --- ### 📝 Commits (10+) - [`c208939`](https://github.com/netblue30/firejail/commit/c20893956faf4e18e1afaa30978427a0847561a1) fids/Makefile: remove code comment - [`39ffe71`](https://github.com/netblue30/firejail/commit/39ffe71bcba205c39ebf236d46d9f5a4be021664) makefiles: remove unused BINOBJS variable - [`289346e`](https://github.com/netblue30/firejail/commit/289346ef863626f917bd3345912ed55fdd09cd40) lib/Makefile: put all target before include of common.mk - [`e8a37ca`](https://github.com/netblue30/firejail/commit/e8a37ca101733c96cd017ce1baa96e29476a276d) Makefile: put the all target after variables - [`72345b7`](https://github.com/netblue30/firejail/commit/72345b7305e1cc7e079c83d805f3af979d7493cd) makefiles: include config.mk directly - [`85e42ed`](https://github.com/netblue30/firejail/commit/85e42edc448ea6384de43e4fcf8ac0d949c043d5) makefiles: equalize object dependencies in program targets - [`87db107`](https://github.com/netblue30/firejail/commit/87db1072092f388a3ff260736e77d168164bd398) makefiles: rename H_FILE_LIST and C_FILE_LIST - [`60a95f0`](https://github.com/netblue30/firejail/commit/60a95f00bb1a3185fce4bacb5367201685767444) makefiles: expand HDRS, SRCS and OBJS immediately - [`f5b1cca`](https://github.com/netblue30/firejail/commit/f5b1ccaad25b26a8bb383a268532f269411e512c) makefiles: move extra deps into new MOD vars - [`350755c`](https://github.com/netblue30/firejail/commit/350755c88ada696de6f21ee20d6775c38fcdb637) makefiles: line-wrap MOD_HDRS and MOD_OBJS ### 📊 Changes **28 files changed** (+213 additions, -350 deletions) <details> <summary>View changed files</summary> 📝 `Makefile` (+4 -2) ➖ `src/common.mk` (+0 -16) 📝 `src/fbuilder/Makefile` (+5 -13) 📝 `src/fcopy/Makefile` (+6 -13) 📝 `src/fids/Makefile` (+5 -14) 📝 `src/firecfg/Makefile` (+11 -12) 📝 `src/firejail/Makefile` (+20 -12) 📝 `src/firemon/Makefile` (+6 -13) 📝 `src/fldd/Makefile` (+6 -13) 📝 `src/fnet/Makefile` (+6 -13) 📝 `src/fnetfilter/Makefile` (+6 -13) 📝 `src/fnettrace-dns/Makefile` (+4 -14) 📝 `src/fnettrace-icmp/Makefile` (+4 -14) 📝 `src/fnettrace-sni/Makefile` (+4 -14) 📝 `src/fnettrace/Makefile` (+4 -14) 📝 `src/fsec-optimize/Makefile` (+6 -13) 📝 `src/fsec-print/Makefile` (+6 -13) 📝 `src/fseccomp/Makefile` (+6 -13) 📝 `src/ftee/Makefile` (+4 -14) 📝 `src/fzenity/Makefile` (+5 -13) _...and 8 more files_ </details> ### 📄 Description Main commits: * makefiles: include config.mk directly * makefiles: equalize object dependencies in program targets * makefiles: rename H_FILE_LIST and C_FILE_LIST * makefiles: expand HDRS, SRCS and OBJS immediately * makefiles: move extra deps into new MOD vars * makefiles: deduplicate main target name into new PROG var * makefiles: deduplicate many makefiles into common.mk * makefiles: deduplicate main target name into new SO var * makefiles: deduplicate lib makefiles into so.mk * makefiles: rename common.mk to prog.mk * makefiles: organize CFLAGS This is kind of a continuation of #5140 and #5219. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:39:42 -06:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5507

No description provided.

Rows
Columns