diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-02-18 18:51:57 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-02-18 18:51:57 +0000 |
| commit | 3c2b1d8bbed09450c9945006b9b5c5e39b15092f (patch) | |
| tree | 690c5250587271f62629f3343dae24279f9e2344 /mdk-stage1/mar/Makefile | |
| parent | 36c36f5268eafce32005d2ffd47e0ff506d1e2a3 (diff) | |
| download | drakx-backup-do-not-use-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar drakx-backup-do-not-use-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar.gz drakx-backup-do-not-use-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar.bz2 drakx-backup-do-not-use-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar.xz drakx-backup-do-not-use-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.zip | |
- Use minilibc on x86-64
- mar requires bzlib to be built beforehand, especially if building with
dietlibc
- Nuke trickery to handle -DIET objects, everything is now built through
the diet driver, defined into $(DIET)
Diffstat (limited to 'mdk-stage1/mar/Makefile')
| -rw-r--r-- | mdk-stage1/mar/Makefile | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/mdk-stage1/mar/Makefile b/mdk-stage1/mar/Makefile index 801785947..94a7a9b88 100644 --- a/mdk-stage1/mar/Makefile +++ b/mdk-stage1/mar/Makefile @@ -24,38 +24,32 @@ include $(top_dir)/Makefile.common TARGETS = libmar.a mar - ifeq (DIETLIBC, $(L)) -TARGETS += libmar-DIET.a +BZLIB = -L $(top_dir)/bzlib -lbzlib +else +BZLIB = -lbz2 endif all: $(TARGETS) clean: - rm -f *.o libmar.a libmar-DIET.a mar + rm -f *.o libmar.a mar mar: mar-frontend.o mar-extract-only-standalone.o - gcc -o mar mar-frontend.o mar-extract-only-standalone.o -lbz2 + $(DIET) gcc -o mar mar-frontend.o mar-extract-only-standalone.o $(BZLIB) $(STRIPCMD) $@ libmar.a: mar-extract-only.o ar -cru $@ $^ ranlib $@ -libmar-DIET.a: mar-extract-only-DIET.o - ar -cru $@ $^ - ranlib $@ - mar-extract-only.o: mar-extract-only.c mar-extract-only.h mar.h - gcc $(CFLAGS) $(GLIBC_INCLUDES) -c mar-extract-only.c - -mar-extract-only-DIET.o: mar-extract-only.c mar-extract-only.h mar.h - gcc $(CFLAGS) $(DIETLIBC_INCLUDES) -o $@ -c mar-extract-only.c + $(DIET) gcc $(CFLAGS) $(INCLUDES) -c mar-extract-only.c mar-frontend.o: mar-frontend.c mar.h mar-extract-only.h - gcc $(CFLAGS) $(GLIBC_INCLUDES) -c mar-frontend.c + $(DIET) gcc $(CFLAGS) $(INCLUDES) -c mar-frontend.c mar-extract-only-standalone.o: mar-extract-only.c mar-extract-only.h mar.h - gcc $(CFLAGS) $(GLIBC_INCLUDES) -o $@ -D_STANDALONE_ -c mar-extract-only.c + $(DIET) gcc $(CFLAGS) $(INCLUDES) -o $@ -D_STANDALONE_ -c mar-extract-only.c |