Makefile: fix merge

9abb0c54 · Kai Germaschewski · 3e12a6dc · 9abb0c54
Commit 9abb0c54 authored May 18, 2002 by Kai Germaschewski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile Makefile +2 -2

No files found.
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o ini
 linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))

 $(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
-	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
+	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)

 # Configuration
 # ---------------------------------------------------------------------------
@@ -473,7 +473,7 @@ tags: dummy
 # FIXME: anybody still using this?

 fs lib mm ipc kernel drivers net sound: dummy
-	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
+	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)

 # Make a backup
 # FIXME anybody still using this?