summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/insmod-modutils
diff options
context:
space:
mode:
authorMatthias Badaire <mbadaire@mandriva.com>2001-05-30 14:31:23 +0000
committerMatthias Badaire <mbadaire@mandriva.com>2001-05-30 14:31:23 +0000
commit0879c2dadfe9f6998bdcddf837918ed8617d17b4 (patch)
tree29d89b91ab9935e390efcf1739a7867b8ea2d8c3 /mdk-stage1/insmod-modutils
parentd8b95b8592b512c3bc036cb2df9745e39104490d (diff)
downloaddrakx-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar
drakx-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar.gz
drakx-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar.bz2
drakx-0879c2dadfe9f6998bdcddf837918ed8617d17b4.tar.xz
drakx-0879c2dadfe9f6998bdcddf837918ed8617d17b4.zip
- allow build on ia64
- have CFLAGS centralized in Makefile.common (should help ports such as alpha) - better looking sub makefiles
Diffstat (limited to 'mdk-stage1/insmod-modutils')
-rw-r--r--mdk-stage1/insmod-modutils/Makefile10
-rw-r--r--mdk-stage1/insmod-modutils/obj/Makefile6
-rw-r--r--mdk-stage1/insmod-modutils/util/Makefile9
3 files changed, 16 insertions, 9 deletions
diff --git a/mdk-stage1/insmod-modutils/Makefile b/mdk-stage1/insmod-modutils/Makefile
index 74ebdeafb..e8f78d2d0 100644
--- a/mdk-stage1/insmod-modutils/Makefile
+++ b/mdk-stage1/insmod-modutils/Makefile
@@ -13,7 +13,9 @@ top_dir = ..
include $(top_dir)/Makefile.common
-FLAGS = -c -Wall -Os -fomit-frame-pointer -I./include -D_GNU_SOURCE -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
+INCS = -I./include
+
+DEFS = -Wno-error -D_GNU_SOURCE -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
DIRS = util obj
@@ -51,11 +53,11 @@ libinsmod-DIET.a: insmod-DIET.o ./util/libutil-DIET.a ./obj/libobj-DIET.a
ranlib $@
insmod-frontend.o: insmod-frontend.c insmod.c
- gcc $(FLAGS) $(GLIBC_INCLUDES) insmod-frontend.c
+ gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c insmod-frontend.c
insmod.o: insmod.c
- gcc $(FLAGS) $(GLIBC_INCLUDES) insmod.c
+ gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c insmod.c
insmod-DIET.o: insmod.c
- gcc $(FLAGS) $(DIETLIBC_INCLUDES) -o $@ insmod.c
+ gcc $(CFLAGS) $(DEFS) $(INCS) $(DIETLIBC_INCLUDES) -o $@ -c insmod.c
diff --git a/mdk-stage1/insmod-modutils/obj/Makefile b/mdk-stage1/insmod-modutils/obj/Makefile
index 9bcf8bac8..34b5df2d9 100644
--- a/mdk-stage1/insmod-modutils/obj/Makefile
+++ b/mdk-stage1/insmod-modutils/obj/Makefile
@@ -19,7 +19,9 @@ clean:
rm -f *.o *.a
-FLAGS = -c -Wall -Os -fomit-frame-pointer -I./../include -D_GNU_SOURCE -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) -DCONFIG_ROOT_CHECK_OFF=0
+INCS = -I./../include
+
+DEFS = -D_GNU_SOURCE -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) -DCONFIG_ROOT_CHECK_OFF=0
OBJS = obj_kallsyms.o obj_common.o obj_load.o obj_reloc.o obj_$(ARCH).o
@@ -28,4 +30,4 @@ libobj.a: $(OBJS)
ranlib $@
.c.o:
- gcc $(FLAGS) $(GLIBC_INCLUDES) -c $<
+ gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $<
diff --git a/mdk-stage1/insmod-modutils/util/Makefile b/mdk-stage1/insmod-modutils/util/Makefile
index 844f8c0dc..763f046f2 100644
--- a/mdk-stage1/insmod-modutils/util/Makefile
+++ b/mdk-stage1/insmod-modutils/util/Makefile
@@ -19,7 +19,10 @@ clean:
rm -f *.o *.a
-FLAGS = -c -Wall -Os -fomit-frame-pointer -I./../include -D_GNU_SOURCE -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) -DHAVE_WORDEXP=1 -DHAVE_GLOB=1 -DCONFIG_ROOT_CHECK_OFF=0
+INCS = -I./../include
+
+DEFS = -Wno-error -D_GNU_SOURCE -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) -DHAVE_WORDEXP=1 -DHAVE_GLOB=1 -DCONFIG_ROOT_CHECK_OFF=0
+
OBJS = xmalloc.o xrealloc.o xstrcat.o xstrdup.o xsystem.o xftw.o \
modstat.o meta_expand.o config.o snap_shot.o arch64.o gzfiles.o sys_nim.o sys_oim.o
@@ -33,7 +36,7 @@ libutil-STANDALONE.a: $(OBJS) logger-standalone.o
ranlib $@
logger-standalone.o: logger.c
- gcc $(FLAGS) $(GLIBC_INCLUDES) -o $@ -D_STANDALONE_ logger.c
+ gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -o $@ -D_STANDALONE_ -c logger.c
.c.o:
- gcc $(FLAGS) $(GLIBC_INCLUDES) -c $<
+ gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $<