Changeset 12258 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Sep 9, 2008 3:01:02 AM (16 years ago)

Author:

vboxsync

Message:

Frontends/Makefiles: Converted VirtualBox 3 & 4 into sub-makefiles, eliminated PAHT_TARGET usage, pushed everything up to the root (sub-makefile wise), and fixed VBoxBFE & VBoxSDL exclusion on hardened darwin.

File:

• trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-DEPTH    ?= ../../../..
-SUB_DEPTH = ..
-endif
 include $(KBUILD_PATH)/subheader.kmk
+if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin"  # No hardened VBoxBFE on darwin (.m).
 
 #
@@ -32 +28 @@
 #
 ifdef VBOX_WITH_HARDENING
- ifneq ($(KBUILD_TARGET),darwin) # No hardened VBoxBFE on darwin (.m).
-  PROGRAMS += VBoxBFEHardened
-  DLLS += VBoxBFE
- endif
+ PROGRAMS += VBoxBFEHardened
+ DLLS += VBoxBFE
 else
  PROGRAMS += VBoxBFE
 endif
+
 
 #
@@ -173 +168 @@
 VBoxBFE_SDLConsole.cpp_DEPS = $(PATH_VBoxBFE)/Ico64x01.h
 
+# Convert the pnm-file to a byte array.
+$$(PATH_VBoxBFE)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
+        $(call MSG_TOOL,bin2c,VBoxBFE,$<,$@)
+        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
 
+
+endif # !VBOX_WITH_HARDENING || !darwin
 include $(KBUILD_PATH)/subfooter.kmk
 
-ifdef PATH_VBoxBFE
-# Convert the pnm-file to a byte array.
-$(PATH_VBoxBFE)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $(call DIRDEP,$(PATH_VBoxBFE))
-        $(call MSG_TOOL,bin2c,VBoxBFE,$<,$@)
-        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
-endif