diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:28:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:28:30 +0000 |
| commit | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (patch) | |
| tree | a4ace45b2343a439688f78d7edb6ee0f1d6d41cc /Rules.make | |
| parent | 02f8110d6a247d53b489b29eec8a35c85e713c6b (diff) | |
Merge with Linux 2.4.0-test6-pre3.
Diffstat (limited to 'Rules.make')
| -rw-r--r-- | Rules.make | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/Rules.make b/Rules.make index c0263dedb..c2d795f24 100644 --- a/Rules.make +++ b/Rules.make @@ -32,8 +32,6 @@ unexport MX_OBJS unexport MIX_OBJS unexport SYMTAB_OBJS -unexport MOD_LIST_NAME - # # Get things started. # @@ -132,38 +130,33 @@ ifneq "$(strip $(ALL_MOBJS))" "" PDWN=$(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh) endif -ifdef MOD_SUB_DIRS -$(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS)) : dummy +unexport MOD_DIRS +MOD_DIRS := $(MOD_SUB_DIRS) $(MOD_IN_SUB_DIRS) +ifneq "$(strip $(MOD_DIRS))" "" +.PHONY: $(patsubst %,_modsubdir_%,$(MOD_DIRS)) +$(patsubst %,_modsubdir_%,$(MOD_DIRS)) : dummy $(MAKE) -C $(patsubst _modsubdir_%,%,$@) modules -endif -ifdef MOD_IN_SUB_DIRS -$(patsubst %,_modinsubdir_%,$(MOD_IN_SUB_DIRS)) : dummy - $(MAKE) -C $(patsubst _modinsubdir_%,%,$@) modules +.PHONY: $(patsubst %,_modinst_%,$(MOD_DIRS)) +$(patsubst %,_modinst_%,$(MOD_DIRS)) : dummy + $(MAKE) -C $(patsubst _modinst_%,%,$@) modules_install endif +.PHONY: modules modules: $(ALL_MOBJS) $(MIX_OBJS) $(MI_OBJS) dummy \ - $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS)) \ - $(patsubst %,_modinsubdir_%,$(MOD_IN_SUB_DIRS)) -ifneq "$(strip $(MOD_LIST_NAME))" "" - rm -f $$TOPDIR/modules/$(MOD_LIST_NAME) -ifdef MOD_SUB_DIRS - for i in $(MOD_SUB_DIRS); do \ - echo `basename $$i`.o >> $$TOPDIR/modules/$(MOD_LIST_NAME); done -endif -ifneq "$(strip $(ALL_MOBJS))" "" - echo $(ALL_MOBJS) >> $$TOPDIR/modules/$(MOD_LIST_NAME) -endif -ifneq "$(strip $(MOD_TO_LIST))" "" - echo $(MOD_TO_LIST) >> $$TOPDIR/modules/$(MOD_LIST_NAME) -endif -endif + $(patsubst %,_modsubdir_%,$(MOD_DIRS)) + +.PHONY: _modinst__ +_modinst__: dummy ifneq "$(strip $(ALL_MOBJS))" "" - echo $(PDWN) - cd $$TOPDIR/modules; for i in $(ALL_MOBJS); do \ - ln -sf ../$(PDWN)/$$i $$i; done + mkdir -p $(MODLIB)/kernel/$(PDWN) + cp $(ALL_MOBJS) $(MODLIB)/kernel/$(PDWN) endif +.PHONY: modules_install +modules_install: _modinst__ \ + $(patsubst %,_modinst_%,$(MOD_DIRS)) + # # A rule to do nothing # |