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/insmod-modutils | |
parent | 36c36f5268eafce32005d2ffd47e0ff506d1e2a3 (diff) | |
download | drakx-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar drakx-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar.gz drakx-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar.bz2 drakx-3c2b1d8bbed09450c9945006b9b5c5e39b15092f.tar.xz drakx-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/insmod-modutils')
-rw-r--r-- | mdk-stage1/insmod-modutils/Makefile | 18 | ||||
-rw-r--r-- | mdk-stage1/insmod-modutils/obj/Makefile | 4 | ||||
-rw-r--r-- | mdk-stage1/insmod-modutils/util/Makefile | 8 |
3 files changed, 11 insertions, 19 deletions
diff --git a/mdk-stage1/insmod-modutils/Makefile b/mdk-stage1/insmod-modutils/Makefile index 794cfb22e..48508ba1f 100644 --- a/mdk-stage1/insmod-modutils/Makefile +++ b/mdk-stage1/insmod-modutils/Makefile @@ -24,7 +24,7 @@ DEFS = -Wno-error -D_GNU_SOURCE \ DIRS = util obj -all: dirs insmod libinsmod.a #libinsmod-DIET.a +all: dirs insmod libinsmod.a dirs: @for n in . $(DIRS); do \ @@ -35,11 +35,11 @@ clean: @for n in $(DIRS); do \ (cd $$n; make clean) \ done - rm -rf t *.o insmod libinsmod.a libinsmod-DIET.a + rm -rf t *.o insmod libinsmod.a insmod: insmod-frontend.o insmod.o ./util/libutil-STANDALONE.a ./obj/libobj.a - gcc -o $@ $^ + $(DIET) gcc -o $@ $^ $(STRIPCMD) $@ t/.create_stuff: util/libutil.a obj/libobj.a @@ -52,16 +52,8 @@ libinsmod.a: insmod.o t/.create_stuff ar cru $@ insmod.o t/* ranlib $@ -libinsmod-DIET.a: insmod-DIET.o ./util/libutil-DIET.a ./obj/libobj-DIET.a - ar cru $@ $^ - ranlib $@ - insmod-frontend.o: insmod-frontend.c insmod.c - gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c insmod-frontend.c + $(DIET) gcc $(CFLAGS) $(DEFS) $(INCS) $(INCLUDES) -c insmod-frontend.c insmod.o: insmod.c - gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c insmod.c - -insmod-DIET.o: insmod.c - gcc $(CFLAGS) $(DEFS) $(INCS) $(DIETLIBC_INCLUDES) -o $@ -c insmod.c - + $(DIET) gcc $(CFLAGS) $(DEFS) $(INCS) $(INCLUDES) -c insmod.c diff --git a/mdk-stage1/insmod-modutils/obj/Makefile b/mdk-stage1/insmod-modutils/obj/Makefile index 4539a4cf7..d44b2a6c6 100644 --- a/mdk-stage1/insmod-modutils/obj/Makefile +++ b/mdk-stage1/insmod-modutils/obj/Makefile @@ -34,5 +34,5 @@ libobj.a: $(OBJS) ar cru $@ $^ ranlib $@ -.c.o: - gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $< +%.o: %.c + $(DIET) gcc $(CFLAGS) $(DEFS) $(INCS) $(INCLUDES) -c $< diff --git a/mdk-stage1/insmod-modutils/util/Makefile b/mdk-stage1/insmod-modutils/util/Makefile index 763f046f2..dd8107435 100644 --- a/mdk-stage1/insmod-modutils/util/Makefile +++ b/mdk-stage1/insmod-modutils/util/Makefile @@ -13,7 +13,7 @@ top_dir = ../.. include $(top_dir)/Makefile.common -all: libutil.a libutil-STANDALONE.a #libutil-DIET.a +all: libutil.a libutil-STANDALONE.a clean: rm -f *.o *.a @@ -36,7 +36,7 @@ libutil-STANDALONE.a: $(OBJS) logger-standalone.o ranlib $@ logger-standalone.o: logger.c - gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -o $@ -D_STANDALONE_ -c logger.c + $(DIET) gcc $(CFLAGS) $(DEFS) $(INCS) $(INCLUDES) -o $@ -D_STANDALONE_ -c logger.c -.c.o: - gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $< +%.o: %.c + $(DIET) gcc $(CFLAGS) $(DEFS) $(INCS) $(INCLUDES) -c $< |