From 1222f097f2cbaaff0e03045549ea7e52e5a55cc5 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 5 Nov 2004 12:59:55 +0000 Subject: remove duplicates in STAGE1OBJS-FULL, this removes make warnings --- mdk-stage1/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 70ad2281d..781c9ca6b 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -128,7 +128,9 @@ CDROMSRC = cdrom.c $(MOVE_ADDSRC) DISKSRC = disk.c directory.c lomount.c NETWORKSRC = network.c nfsmount.c dhcp.c url.c dns.c adsl.c directory.c lomount.c $(MOVE_ADDSRC) -ALLSRC = $(INITSRC) $(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC) +# use sort to remove duplicates +STAGE1_ALLSRC = $(sort $(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC)) +ALLSRC = $(INITSRC) $(STAGE1_ALLSRC) @@ -142,7 +144,7 @@ STAGE1OBJS-NETWORK = $(subst .c,-NETWORK.o,$(STAGE1SRC) $(NETWORKSRC)) NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK -STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC)) +STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1_ALLSRC)) ifeq (i386, $(ARCH)) -- cgit v1.2.1