Makefile: compile and link each module just once
PATCH 1/1 Makefile: compile and link each module just once
Several source files need to be compiled and linked when one or more config options are selected. To allow for easy selection in the Makefiles yet to avoild multiple compilation (which costs build time) and especially multiple linking (which causes errors), we use "COBJS = $(sort COBJS-y)" which eliminates duplicates.
By courtesy of Detlev Zundel who suggested this approach.
--- common/Makefile | 9 +++++---- drivers/rtc/Makefile | 6 +++--- drivers/serial/Makefile | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
common/Makefile +5 -4
@@ -56,7 +56,8 @@ COBJS-y += env_nowhere.o # command COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -COBJS-$(CONFIG_AUTOSCRIPT)$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o +COBJS-$(CONFIG_AUTOSCRIPT) += cmd_autoscript.o +COBJS-$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
@@ -110,7 +111,8 @@ COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o COBJS-y += cmd_mac.o COBJS-y += cmd_mem.o COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o -COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o +COBJS-$(CONFIG_MII) += miiphyutil.o +COBJS-$(CONFIG_CMD_MII) += miiphyutil.o COBJS-$(CONFIG_CMD_MII) += cmd_mii.o COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
@@ -151,8 +153,7 @@ COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o -COBJS-y += $(COBJS-yy) -COBJS := $(COBJS-y) +COBJS := $(sort COBJS-y) SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
drivers/rtc/Makefile +3 -3
@@ -32,8 +32,8 @@ COBJS-y += date.o COBJS-$(CONFIG_RTC_DS12887) += ds12887.o COBJS-$(CONFIG_RTC_DS1302) += ds1302.o COBJS-$(CONFIG_RTC_DS1306) += ds1306.o -COBJS-$(CONFIG_RTC_DS1307)$(CONFIG_RTC_DS1338) += ds1307.o -COBJS-y += $(COBJS-yy) +COBJS-$(CONFIG_RTC_DS1307) += ds1307.o +COBJS-$(CONFIG_RTC_DS1338) += ds1307.o COBJS-$(CONFIG_RTC_DS1337) += ds1337.o COBJS-$(CONFIG_RTC_DS1374) += ds1374.o COBJS-$(CONFIG_RTC_DS1556) += ds1556.o
@@ -59,7 +59,7 @@ COBJS-$(CONFIG_RTC_RX8025) += rx8025.o COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o COBJS-$(CONFIG_RTC_X1205) += x1205.o -COBJS := $(COBJS-y) +COBJS := $(sort COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
drivers/serial/Makefile +1 -1
@@ -39,7 +39,7 @@ COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o COBJS-$(CONFIG_USB_TTY) += usbtty.o -COBJS := $(COBJS-y) +COBJS := $(sort COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
Signature · 1 line
1.5.6.1
PATCH 1/1 Makefile: compile and link each module just once
Review
Quoted 8 lines · Wolfgang Denk
[...]
"COBJS = $(sort COBJS-y)" which eliminates duplicates. [...](quoted diff) +3
-0+COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y)
I think you'll have more luck with $(sort $(COBJS-y)).
Regards,
Andreas
PATCH 1/1 Makefile: compile and link each module just once
Dear Andreas Engel,
Quoted 11 lines · In message <[email protected]> you wrote:
Review
Quoted 8 lines · Wolfgang Denk
[...]
"COBJS = $(sort COBJS-y)" which eliminates duplicates. [...](quoted diff) +3
-0+COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y)I think you'll have more luck with $(sort $(COBJS-y)).
Argh! Of course you are right.
And I idiot pushed this out already so we have a number of un-bisectable patches on top :-( It's time to go home, it seems.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Lack of skill dictates economy of style. - Joey Ramone
PATCH 1/1 Makefile: compile and link each module just once
Quoted 14 lines · Wolfgang Denk
Dear Andreas Engel,
Quoted 10 lines · In message <[email protected]> you wrote:
Review
Quoted 8 lines · Wolfgang Denk
[...]
"COBJS = $(sort COBJS-y)" which eliminates duplicates. [...](quoted diff) +3
-0+COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y)I think you'll have more luck with $(sort $(COBJS-y)).
Quoted 4 lines
Argh! Of course you are right.
And I idiot pushed this out already so we have a number of un-bisectable patches on top :-( It's time to go home, it seems.
Time for that beer we all owe you. You can put the first one on my tab.
;-)
gvb
PATCH 1/1 Makefile: compile and link each module just once
Quoted 15 lines · JerryVanBaren
Quoted 14 lines · Wolfgang Denk
Dear Andreas Engel,
Quoted 10 lines · In message <[email protected]> you wrote:
Review
Quoted 8 lines · Wolfgang Denk
[...]
"COBJS = $(sort COBJS-y)" which eliminates duplicates. [...](quoted diff) +3
-0+COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y) +COBJS := $(sort COBJS-y)I think you'll have more luck with $(sort $(COBJS-y)).
Quoted 7 lines
Quoted 4 lines
Argh! Of course you are right.
And I idiot pushed this out already so we have a number of un-bisectable patches on top :-( It's time to go home, it seems.
Time for that beer we all owe you. You can put the first one on my tab.
We all do this kind of thing. But you can put the second one on my tab.
;-)
Best Regards,
J.
PATCH 1/1 Makefile: compile and link each module just once
In reply to JerryVanBarenDear JerryVanBaren,
Quoted 2 lines · In message <[email protected]> you wrote:
Time for that beer we all owe you. You can put the first one on my tab.
Here it is.
Sorry, it's just a virtual one. Make sure to correctly initialize your TLBs...
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "A verbal contract isn't worth the paper it's printed on." - Samuel Goldwyn