Changeset 68610 in vbox for trunk/src/VBox/Installer/linux/Makefile.include.footer

Timestamp:

Sep 1, 2017 4:46:58 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117834

Message:

Linux driver make files: reverted r117833.

File:

• trunk/src/VBox/Installer/linux/Makefile.include.footer (modified) (4 diffs)

trunk/src/VBox/Installer/linux/Makefile.include.footer

@@ -18 +18 @@
 override MODULE = $(MOD_NAME)
 OBJS   = $(MOD_OBJS)
+
+ifneq ($(MAKECMDGOALS),clean)
 
 KBUILD_VERBOSE ?= 1
@@ -42 +44 @@
 #
 
-# Note: while 2.4 kernels could also do "proper" builds from kbuild, the make
-# script needed to support it was somewhat different from 2.6.  Since this
-# script works and 2.4 is not a moving target we will not try do do things the
-# "proper" way.
-
 ifeq ($(BUILD_TARGET_ARCH),amd64)
  KFLAGS  += -mcmodel=kernel
@@ -62 +59 @@
 $(MODULE): $(MODULE).o
 
-install: $(MODULE)
-        @mkdir -p $(MODULE_DIR); \
-        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) \
-        $(INSTALL_MOD_PATH)/$(KERN_DIR)/$(INSTALL_MOD_DIR); \
-        PATH="$(PATH):/bin:/sbin" depmod -a;
-
-clean:
-        for f in $(sort $(dir $(OBJS))); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
-        rm -rf .$(MOD_NAME)* .tmp_ver* $(MOD_NAME).* Modules.symvers modules.order
-
-else  # ! $(KERN_VERSION), 24
+else
 #
 # 2.6 and later
@@ -98 +85 @@
         $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) -j$(JOBS) modules
 
+modules_install:
+        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules_install
+
+endif
+
 install: $(MODULE)
-        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
+        @mkdir -p $(MODULE_DIR); \
+        install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
+        PATH="$(PATH):/bin:/sbin" depmod -a;
 
-modules_install: install
-all: install
+endif # eq($(MAKECMDGOALS),clean)
 
 clean:
-        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) CONFIG_MODULE_SIG= -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) clean
-
-.PHONY: $(MODULE) install modules_install clean
-endif
+        for f in $(MOD_CLEAN); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
+        rm -rf .$(MOD_NAME)* .tmp_ver* $(MOD_NAME).* Modules.symvers modules.order