From 97f733d69b6912f7b0a9eb3664140c10884ffef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= Date: Wed, 19 Feb 2003 18:02:17 +0000 Subject: Rearrange build so that only mar binary is built with glibc and other objects with either glibc or dietlibc. --- mdk-stage1/mar/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/mdk-stage1/mar/Makefile b/mdk-stage1/mar/Makefile index 94a7a9b88..0a12e21d8 100644 --- a/mdk-stage1/mar/Makefile +++ b/mdk-stage1/mar/Makefile @@ -24,12 +24,6 @@ include $(top_dir)/Makefile.common TARGETS = libmar.a mar -ifeq (DIETLIBC, $(L)) -BZLIB = -L $(top_dir)/bzlib -lbzlib -else -BZLIB = -lbz2 -endif - all: $(TARGETS) @@ -38,7 +32,7 @@ clean: mar: mar-frontend.o mar-extract-only-standalone.o - $(DIET) gcc -o mar mar-frontend.o mar-extract-only-standalone.o $(BZLIB) + gcc -o mar mar-frontend.o mar-extract-only-standalone.o -lbz2 $(STRIPCMD) $@ libmar.a: mar-extract-only.o @@ -49,7 +43,7 @@ mar-extract-only.o: mar-extract-only.c mar-extract-only.h mar.h $(DIET) gcc $(CFLAGS) $(INCLUDES) -c mar-extract-only.c mar-frontend.o: mar-frontend.c mar.h mar-extract-only.h - $(DIET) gcc $(CFLAGS) $(INCLUDES) -c mar-frontend.c + gcc $(CFLAGS) $(GLIBC_INCLUDES) -c mar-frontend.c mar-extract-only-standalone.o: mar-extract-only.c mar-extract-only.h mar.h - $(DIET) gcc $(CFLAGS) $(INCLUDES) -o $@ -D_STANDALONE_ -c mar-extract-only.c + gcc $(CFLAGS) $(GLIBC_INCLUDES) -o $@ -D_STANDALONE_ -c mar-extract-only.c -- cgit v1.2.1