diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-05 12:59:55 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-05 12:59:55 +0000 |
| commit | 1222f097f2cbaaff0e03045549ea7e52e5a55cc5 (patch) | |
| tree | 57d948cc3118f13bc5b203ad8acc2f20b74855de /mdk-stage1 | |
| parent | 75934b664684403bd03279f3c416c803b703a942 (diff) | |
| download | drakx-1222f097f2cbaaff0e03045549ea7e52e5a55cc5.tar drakx-1222f097f2cbaaff0e03045549ea7e52e5a55cc5.tar.gz drakx-1222f097f2cbaaff0e03045549ea7e52e5a55cc5.tar.bz2 drakx-1222f097f2cbaaff0e03045549ea7e52e5a55cc5.tar.xz drakx-1222f097f2cbaaff0e03045549ea7e52e5a55cc5.zip | |
remove duplicates in STAGE1OBJS-FULL, this removes make warnings
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/Makefile | 6 |
1 files 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)) |