diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-02-18 16:56:00 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-02-18 16:56:00 +0000 |
| commit | c266ff57a4c819a569c2f85d23f3c6c785fe1bd2 (patch) | |
| tree | d95313ecfd623e4d7656630103303f2a11d4d3a5 | |
| parent | cfc97c2e6d73efdf65b5ff0fc6ee66f1dc19f36c (diff) | |
| download | drakx-backup-do-not-use-c266ff57a4c819a569c2f85d23f3c6c785fe1bd2.tar drakx-backup-do-not-use-c266ff57a4c819a569c2f85d23f3c6c785fe1bd2.tar.gz drakx-backup-do-not-use-c266ff57a4c819a569c2f85d23f3c6c785fe1bd2.tar.bz2 drakx-backup-do-not-use-c266ff57a4c819a569c2f85d23f3c6c785fe1bd2.tar.xz drakx-backup-do-not-use-c266ff57a4c819a569c2f85d23f3c6c785fe1bd2.zip | |
Fixes for unmerged parts (contrib, examples)
| -rw-r--r-- | mdk-stage1/dietlibc/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mdk-stage1/dietlibc/Makefile b/mdk-stage1/dietlibc/Makefile index ca28ec345..0b14f7d11 100644 --- a/mdk-stage1/dietlibc/Makefile +++ b/mdk-stage1/dietlibc/Makefile @@ -79,7 +79,7 @@ WHAT= $(OBJDIR) $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o $(OBJDIR)/dyn_stop.o \ $(OBJDIR)/dietlibc.a $(OBJDIR)/liblatin1.a \ $(OBJDIR)/libcompat.a $(OBJDIR)/libm.a \ $(OBJDIR)/librpc.a $(OBJDIR)/libpthread.a \ - $(OBJDIR)/diet $(OBJDIR)/diet-i $(OBJDIR)/elftrunc + $(OBJDIR)/diet $(OBJDIR)/diet-i all: $(WHAT) @@ -244,9 +244,6 @@ $(PICODIR)/libcompat.so: $(DYN_LIBCOMPAT_OBJS) dietfeatures.h $(SYSCALLOBJ): syscalls.h -$(OBJDIR)/elftrunc: $(OBJDIR)/diet contrib/elftrunc.c - bin-$(MYARCH)/diet $(CROSS)$(CC) $(CFLAGS) -o $@ contrib/elftrunc.c - VERSION=dietlibc-$(shell head -1 CHANGES|sed 's/://') CURNAME=$(notdir $(shell pwd)) @@ -277,9 +274,8 @@ $(OBJDIR)/load: chmod 755 $@ clean: - rm -f *.o *.a t t1 compile load elftrunc exports mapfile libdietc.so + rm -f *.o *.a t t1 compile load exports mapfile libdietc.so rm -rf bin-* pic-* - $(MAKE) -C examples clean $(MAKE) -C dynlinker clean $(MAKE) -C libdl clean @@ -299,7 +295,7 @@ t: t1: $(CROSS)$(CC) -g -o t1 t.c -install: $(OBJDIR)/start.o $(OBJDIR)/dietlibc.a $(OBJDIR)/librpc.a $(OBJDIR)/liblatin1.a $(OBJDIR)/libcompat.a $(OBJDIR)/elftrunc $(OBJDIR)/diet-i +install: $(OBJDIR)/start.o $(OBJDIR)/dietlibc.a $(OBJDIR)/librpc.a $(OBJDIR)/liblatin1.a $(OBJDIR)/libcompat.a $(OBJDIR)/diet-i $(INSTALL) -d $(DESTDIR)$(ILIBDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(BINDIR) $(INSTALL) $(OBJDIR)/start.o $(DESTDIR)$(ILIBDIR)/start.o $(INSTALL) -m 644 $(OBJDIR)/libm.a $(OBJDIR)/libpthread.a $(OBJDIR)/librpc.a \ |