From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Subject: [B.A.T.M.A.N.] [PATCH 02/10] alfred: Split list of objects in Makefile into separate lines
Date: Sun, 5 Jun 2016 20:47:00 +0200 [thread overview]
Message-ID: <1465152428-17299-2-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1465152428-17299-1-git-send-email-sven@narfation.org>
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
The line of objects which are required to compile alfred gets longer and
becomes harder to read. Instead save each object on its own line to make it
easier to edit and easier to solve conflicts when multiple patches modify
the list of objects.
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
Makefile | 12 +++++++++++-
gpsd/Makefile | 2 +-
vis/Makefile | 3 ++-
3 files changed, 14 insertions(+), 3 deletions(-)
mode change 100644 => 100755 Makefile
mode change 100644 => 100755 gpsd/Makefile
mode change 100644 => 100755 vis/Makefile
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 939e9f8..1c364f7
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,17 @@
# alfred build
BINARY_NAME = alfred
-OBJ = main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o debugfs.o batadv_query.o
+OBJ += batadv_query.o
+OBJ += client.o
+OBJ += debugfs.o
+OBJ += hash.o
+OBJ += main.o
+OBJ += netsock.o
+OBJ += recv.o
+OBJ += send.o
+OBJ += server.o
+OBJ += unix_sock.o
+OBJ += util.o
MANPAGE = man/alfred.8
# alfred flags and options
diff --git a/gpsd/Makefile b/gpsd/Makefile
old mode 100644
new mode 100755
index 72e4445..bae5660
--- a/gpsd/Makefile
+++ b/gpsd/Makefile
@@ -20,7 +20,7 @@
# alfred-gpsd build
BINARY_NAME = alfred-gpsd
-OBJ = alfred-gpsd.o
+OBJ += alfred-gpsd.o
MANPAGE = man/alfred-gpsd.8
# alfred flags and options
diff --git a/vis/Makefile b/vis/Makefile
old mode 100644
new mode 100755
index accd1fa..52ca981
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -20,7 +20,8 @@
# batadv-vis build
BINARY_NAME = batadv-vis
-OBJ = vis.o debugfs.o
+OBJ += debugfs.o
+OBJ += vis.o
MANPAGE = man/batadv-vis.8
# batadv-vis flags and options
--
2.8.1
next prev parent reply other threads:[~2016-06-05 18:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-05 18:46 [B.A.T.M.A.N.] [PATCH 01/10] alfred: vis: Fix parsing of iface_status Sven Eckelmann
2016-06-05 18:47 ` Sven Eckelmann [this message]
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 03/10] alfred: Add netlink dependencies Sven Eckelmann
2016-07-21 15:58 ` Simon Wunderlich
2016-07-21 16:01 ` Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 04/10] alfred: Add CAP_NET_ADMIN capabilities for netlink Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 05/10] alfred: Split translate_mac from debugfs backend Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 06/10] alfred: Translate mac addresses via netlink Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 07/10] alfred: Split get_tq from debugfs backend Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 08/10] alfred: Query TQ of originators via netlink Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 09/10] alfred: vis: Save device index in interface list Sven Eckelmann
2016-06-05 18:47 ` [B.A.T.M.A.N.] [PATCH 10/10] alfred: vis: Add support for netlink Sven Eckelmann
2016-07-16 7:28 ` [B.A.T.M.A.N.] [PATCH 11/11] alfred: Switch netlink uapi header copyright to ISC Sven Eckelmann
2016-07-26 11:55 ` [B.A.T.M.A.N.] [PATCH 01/10] alfred: vis: Fix parsing of iface_status Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465152428-17299-2-git-send-email-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=sven.eckelmann@open-mesh.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox