Messages in this thread Patch in this message | | | From | "Nicholas J. Leon" <> | Date | Fri, 29 May 1998 13:54:07 -0400 (EDT) | Subject | [TINY PATCH 2.1.x] Minor nit and fix for main Makefile |
| |
Continuing my submission of tiny patches, here's another one that fixes somethings that bothered me.
1. "make modules_install" didn't depend on modules 2. "make" by itself would build whatever was NEXT (config/depend/vmlinux) and then stop. I wanted to be able to "make" and have everything get built, including modules.
Is there any reason why this shouldn't be included? (Please let me know, I'm trying to learn, you know. And if I missing something important, I would like to know about it so that I don't screw up again :)
Thank you!
--- linux.104-prist/Makefile Thu May 28 11:18:38 1998 +++ linux.104-makefile/Makefile Fri May 29 13:51:44 1998 @@ -44,18 +44,22 @@ # Make "config" the default target if there is no configuration file or # "depend" the target if there is no top-level dependency information. # + ifeq (.config,$(wildcard .config)) include .config +else +TOMAKE := $(TOMAKE) config +endif ifeq (.depend,$(wildcard .depend)) include .depend -do-it-all: Version vmlinux else -CONFIGURATION = depend -do-it-all: depend +TOMAKE := $(TOMAKE) depend endif + +ifdef CONFIG_MODULES +do-it-all: $(TOMAKE) Version vmlinux modules else -CONFIGURATION = config -do-it-all: config +do-it-all: $(TOMAKE) Version vmlinux endif # @@ -177,7 +181,7 @@ boot: vmlinux @$(MAKE) -C arch/$(ARCH)/boot -vmlinux: $(CONFIGURATION) init/main.o init/version.o linuxsubdirs +vmlinux: $(TOMAKE) init/main.o init/version.o linuxsubdirs $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \ $(CORE_FILES) \ $(FILESYSTEMS) \ @@ -299,7 +303,7 @@ do $(MAKE) -C $$i CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules; \ done -modules_install: +modules_install: modules @( \ MODLIB=/lib/modules/$(VERSION).$(PATCHLEVEL).$(SUBLEVEL); \ cd modules; \
___________________________________________________________________________ simple is elegant mrnick.binary9.net nicholas@binary9.net ___________________________________________________________________________ Linux 2.1.104 #2 Thu May 28 14:52:53 EDT 1998, up 22:43 Linux 2.1.103 #2 Fri May 22 11:45:19 EDT 1998, up 1 day Linux 2.1.96 #2 Wed Apr 15 11:38:48 EDT 1998, up 3 days
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu
| |