diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-06-04 18:31:57 +0000 |
| commit | 09e967c2d732783b2579e4e120cd9b608404cb00 (patch) | |
| tree | 8d2783a6a7e33608c6012efd6a88b8f5694df81d /mdk-stage1/mar/Makefile | |
| parent | 18fcff49d3c836697d3b75a3d01d31c700e69974 (diff) | |
| download | drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.gz drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.bz2 drakx-09e967c2d732783b2579e4e120cd9b608404cb00.tar.xz drakx-09e967c2d732783b2579e4e120cd9b608404cb00.zip | |
Merge from R9_0-AMD64, most notably:
- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes
Diffstat (limited to 'mdk-stage1/mar/Makefile')
| -rw-r--r-- | mdk-stage1/mar/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/mdk-stage1/mar/Makefile b/mdk-stage1/mar/Makefile index 801785947..0a12e21d8 100644 --- a/mdk-stage1/mar/Makefile +++ b/mdk-stage1/mar/Makefile @@ -25,15 +25,10 @@ include $(top_dir)/Makefile.common TARGETS = libmar.a mar -ifeq (DIETLIBC, $(L)) -TARGETS += libmar-DIET.a -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 @@ -44,15 +39,8 @@ 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 |