Changeset 24380 in vbox for trunk/src/VBox
- Timestamp:
- Nov 5, 2009 1:00:58 PM (15 years ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/linux/Makefile.kmk
r24379 r24380 56 56 # Script source directories 57 57 VBOX_PATH_LNX_ADD_INST := $(PATH_SUB_CURRENT)/installer 58 VBOX_REL_LNX_ADD_INST := $(subst $(PATH_ROOT)/src/VBox, \ 59 ../..,$(VBOX_PATH_LNX_ADD_INST)) 58 VBOX_REL_LNX_ADD_INST := $(subst $(PATH_ROOT)/src/VBox, ../..,$(VBOX_PATH_LNX_ADD_INST)) 60 59 VBOX_PATH_X11_ADD_INST := $(PATH_ROOT)/src/VBox/Additions/x11/Installer 61 VBOX_REL_X11_ADD_INST := $(subst $(PATH_ROOT)/src/VBox, \ 62 ../..,$(VBOX_PATH_X11_ADD_INST)) 60 VBOX_REL_X11_ADD_INST := $(subst $(PATH_ROOT)/src/VBox, ../..,$(VBOX_PATH_X11_ADD_INST)) 63 61 VBOX_PATH_LNX_INST_SRC := $(PATH_ROOT)/src/VBox/Installer/linux 64 VBOX_REL_LNX_INST_SRC := $(subst $(PATH_ROOT)/src/VBox, \ 65 ../..,$(VBOX_PATH_LNX_INST_SRC)) 62 VBOX_REL_LNX_INST_SRC := $(subst $(PATH_ROOT)/src/VBox, ../..,$(VBOX_PATH_LNX_INST_SRC)) 66 63 67 64 # Unset this to speed up things during makefile hacking. … … 74 71 ifndef VBOX_OSE 75 72 BLDDIRS += \ 76 77 78 79 80 81 82 83 84 85 86 87 88 73 $(VBOX_LNX_ADD_INST_OUT_DIR) \ 74 $(VBOX_LNX_ADD_INST_BIN_DIR) \ 75 $(VBOX_LNX_ADD_INST_SBIN_DIR) \ 76 $(VBOX_LNX_ADD_INST_LIB_DIR) \ 77 $(VBOX_LNX_ADD_INST_MOD_DIR) \ 78 $(VBOX_LNX_ADD_INST_KMOD_DIR) \ 79 $(VBOX_LNX_ADD_INST_INIT_DIR) \ 80 $(VBOX_LNX_ADD_INST_DBG_DIR) \ 81 $(VBOX_LNX_ADD_INST_BIN_DBG_DIR) \ 82 $(VBOX_LNX_ADD_INST_SBIN_DBG_DIR) \ 83 $(VBOX_LNX_ADD_INST_LIB_DBG_DIR) \ 84 $(VBOX_LNX_ADD_INST_MOD_DBG_DIR) \ 85 $(VBOX_LNX_ADD_INST_STAGE_DIR) 89 86 PACKING += \ 90 91 87 $(PATH_BIN)/additions/VBoxLinuxAdditions.run \ 88 $(VBOX_LNX_ADD_INST_STAGE_DIR)/VBoxGuestAdditions.tar.bz2 92 89 OTHER_CLEAN += $(PACKING) 93 90 # OSE only contains the source code for this … … 155 152 VBOX_LNX_ADD_STRIP_BIN = $(VBOX_ADD_STRIP_BIN) $(VBOX_ADD_STRIP_BIN.linux) 156 153 VBOX_LNX_ADD_BIN = $(VBOX_ADD_BIN) $(VBOX_ADD_BIN.linux) 157 VBOX_LNX_ADD_STRIP_SBIN 154 VBOX_LNX_ADD_STRIP_SBIN= $(VBOX_ADD_STRIP_SBIN) $(VBOX_ADD_STRIP_SBIN.linux) 158 155 VBOX_LNX_ADD_STRIP_LIB = $(VBOX_ADD_STRIP_LIB) $(VBOX_ADD_STRIP_LIB.linux) 159 156 VBOX_LNX_ADD_STRIP_MOD = $(VBOX_ADD_STRIP_MOD) $(VBOX_ADD_STRIP_MOD.linux) … … 253 250 endif 254 251 252 ## @todo r=bird: "files"? isn't this also copying directory trees (-a implies -R)? 255 253 # pattern rule for copying the VBOX_LNX_ADD_KMOD files to the installation directory 256 254 $(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR)/,$(VBOX_LNX_ADD_KMOD_VERSIONED)): \ … … 272 270 273 271 272 ## @todo r=bird: Please, do not use VBOX_OSE test for 50 targets like this. use a big ifdef around the whole block! 274 273 INSTALLS += $(if $(VBOX_OSE),, lnx_add_inst-exec) 275 lnx_add_inst-exec_INST = $(subst $(PATH_TARGET),obj, \ 276 274 ## @todo r=bird: INST values ends with a slash. 275 lnx_add_inst-exec_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_MOD_DIR)) 277 276 lnx_add_inst-exec_MODE = a+rx,u+w 278 277 lnx_add_inst-exec_SOURCES = \ 279 280 281 282 283 284 278 $(VBOX_REL_LNX_ADD_INST)/vboxadd-service.sh \ 279 $(VBOX_REL_X11_ADD_INST)/98vboxadd-xclient \ 280 $(VBOX_REL_LNX_ADD_INST)/vboxadd.sh \ 281 $(VBOX_REL_X11_ADD_INST)/x11config.pl \ 282 $(VBOX_REL_X11_ADD_INST)/x11config15.pl \ 283 $(VBOX_REL_LNX_INST_SRC)/routines.sh 285 284 286 285 287 286 INSTALLS += $(if $(VBOX_OSE),, lnx_add_inst-noexec) 288 lnx_add_inst-noexec_INST = $(subst $(PATH_TARGET),obj, \ 289 $(VBOX_LNX_ADD_INST_SHARE_DIR)/$(VBOX_LNX_ADD_PACKAGE_NAME)) 287 lnx_add_inst-noexec_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_SHARE_DIR)/$(VBOX_LNX_ADD_PACKAGE_NAME)) 290 288 lnx_add_inst-noexec_MODE = a+r,u+w 291 289 lnx_add_inst-noexec_SOURCES = \ 292 293 294 295 296 290 $(VBOX_REL_X11_ADD_INST)/vboxclient.desktop \ 291 $(VBOX_REL_X11_ADD_INST)/vboxvideo.ids \ 292 $(VBOX_REL_X11_ADD_INST)/linux_xorg_suse11.conf \ 293 $(VBOX_REL_LNX_ADD_INST)/90-vboxguest.fdi \ 294 selinux-fedora/vbox_x11.pp 297 295 298 296 … … 313 311 # 314 312 INSTALLS += $(if $(VBOX_OSE),, LnxAddTest-src) 315 LnxAddTest-src_INST = $(subst $(PATH_TARGET),obj, \ 316 $(VBOX_LNX_ADD_INST_SHARE_DIR)/$(VBOX_LNX_ADD_PACKAGE_NAME))/test 313 LnxAddTest-src_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_SHARE_DIR)/$(VBOX_LNX_ADD_PACKAGE_NAME))/test 317 314 LnxAddTest-src_MODE = a+r,u+w 318 315 LnxAddTest-src_SOURCES = \ 319 320 321 $(VBOX_REL_LNX_ADD_INST)/test.c316 $(VBOX_REL_LNX_ADD_INST)/Makefile.test=>Makefile \ 317 ../../HostDrivers/linux/build_in_tmp \ 318 $(VBOX_REL_LNX_ADD_INST)/test.c 322 319 323 320 … … 326 323 # 327 324 INSTALLS += $(if $(VBOX_OSE),, LnxAddDRM-src) 328 LnxAddDRM-src_INST = $(subst $(PATH_TARGET),obj, \ 329 $(VBOX_LNX_ADD_INST_SHARE_DIR)/$(VBOX_LNX_ADD_PACKAGE_NAME))/test_drm 325 LnxAddDRM-src_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_SHARE_DIR)/$(VBOX_LNX_ADD_PACKAGE_NAME))/test_drm 330 326 LnxAddDRM-src_MODE = a+r,u+w 331 327 LnxAddDRM-src_SOURCES = \ 332 333 334 335 336 328 $(VBOX_REL_LNX_ADD_INST)/Makefile.include.header \ 329 $(VBOX_REL_LNX_ADD_INST)/Makefile.include.footer \ 330 $(VBOX_REL_LNX_ADD_INST)/Makefile.test.drm=>Makefile \ 331 ../../HostDrivers/linux/build_in_tmp \ 332 $(VBOX_REL_LNX_ADD_INST)/test_drm.c 337 333 338 334 … … 354 350 $(QUIET)$(RM) $(VBOX_LNX_ADD_INST_OUT_DIR)/install.sh 355 351 OTHERS_CLEAN += \ 356 357 352 $(VBOX_LNX_ADD_INST_OUT_DIR)/install.sh \ 353 $(VBOX_LNX_ADD_INST_STAGE_DIR)/install.sh 358 354 359 355 … … 363 359 # 364 360 INSTALLS += $(if $(VBOX_OSE),, LnxAdd-scripts) 365 LnxAdd-scripts_INST = $(subst $(PATH_TARGET),obj, \ 366 $(VBOX_LNX_ADD_INST_STAGE_DIR)) 361 LnxAdd-scripts_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_STAGE_DIR)) 367 362 LnxAdd-scripts_MODE = a+r,u+wx 368 363 LnxAdd-scripts_SOURCES = \ 369 370 371 364 $(VBOX_REL_LNX_INST_SRC)/routines.sh \ 365 $(VBOX_REL_LNX_ADD_INST)/uninstall.sh \ 366 $(VBOX_REL_LNX_ADD_INST)/deffiles 372 367 373 368 … … 376 371 # 377 372 INSTALLS += $(if $(VBOX_OSE),, LnxAdd-Nostrip-Bin) 378 LnxAdd-Nostrip-Bin_INST = $(subst $(PATH_TARGET),obj, \ 379 $(VBOX_LNX_ADD_INST_BIN_DIR)) 373 LnxAdd-Nostrip-Bin_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_BIN_DIR)) 380 374 LnxAdd-Nostrip-Bin_MODE = a+r,u+wx 381 375 LnxAdd-Nostrip-Bin_SOURCES = \ 382 383 376 $(VBOX_REL_X11_ADD_INST)/VBoxRandR.sh=>VBoxRandR \ 377 $(VBOX_REL_X11_ADD_INST)/98vboxadd-xclient=>VBoxClient-all 384 378 385 379 … … 391 385 LnxAdd-init-scripts_MODE = a+r,u+wx 392 386 LnxAdd-init-scripts_SOURCES = \ 393 387 $(foreach i,$(VBOX_LNX_ADD_INIT), installer/$(i).sh=>$(i)) 394 388 395 389 … … 399 393 # All the files that go into our archive 400 394 VBOX_LNX_ADD_ARCH_FILES = \ 401 402 403 404 405 395 $(INSTARGET_lnx_add_inst-noexec) \ 396 $(INSTARGET_lnx_add_inst-exec) \ 397 $(INSTARGET_LnxAddTest-src) \ 398 $(INSTARGET_LnxAddDRM-src) \ 399 $(VBOX_LNX_ADD_INST_FILES) 406 400 407 401 # … … 442 436 "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux" \ 443 437 /bin/sh ./install.sh "> /dev/null" 438
Note:
See TracChangeset
for help on using the changeset viewer.
