Changeset 12446 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Sep 14, 2008 11:32:31 PM (16 years ago)

Author:

vboxsync

Message:

Additions/Makefiles: Pushed them up to root (sub-makefile wise). Some cleanups, opengl omitted.

Location:

trunk/src/VBox/Additions/common

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxControl/Makefile.kmk (modified) (1 diff)
• VBoxGuest/Makefile.kmk (modified) (6 diffs)
• VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
• VBoxService/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/common/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-DEPTH    ?= ../../../..
-SUB_DEPTH = ..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -32 +27 @@
 include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
 if1of ($(KBUILD_TARGET), freebsd os2 solaris)
-include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
-include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
 endif
 

trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-SUB_DEPTH = ../..
-DEPTH    ?= ../../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -20 +20 @@
 #
 
-DEPTH ?= ../../../../..
-SUB_DEPTH = ../..
+SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -36 +35 @@
  VBoxGuest_TEMPLATE      = VBOXGUESTR0
  VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
- VBoxGuest_INCS         := $(PATH_SUB_CURRENT)
+ VBoxGuest_INCS          = .
  ifneq ($(KBUILD_TARGET),os2)
   VBoxGuest_SOURCES    = \
@@ -63 +62 @@
   VBoxGuestLibOs2Hack_NOINST     = 1
   VBoxGuestLibOs2Hack_DEFS       = $(VBoxGuest_DEFS)
-  VBoxGuestLibOs2Hack_INCS      := \
-        $(PATH_SUB_CURRENT) \
-        $(PATH_TARGET) \
+  VBoxGuestLibOs2Hack_INCS       = \
+        . \
         $(PATH_ROOT)/src/VBox/Runtime/include # for the os2ddk
   VBoxGuestLibOs2Hack_SOURCES    = \
@@ -80 +78 @@
  vboxguest_TEMPLATE      = VBOXGUESTR0
  vboxguest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
- vboxguest_INCS         := \
-        $(PATH_SUB_CURRENT)
+ vboxguest_INCS          = \
+        .
  vboxguest_INCS.freebsd  = \
-        $(PATH_TARGET)
+        $(PATH_vboxguest)
  vboxguest_SOURCES       = \
         VBoxGuest-$(KBUILD_TARGET).c \
@@ -91 +89 @@
         $(VBOX_LIB_IPRT_GUEST_R0)
  vboxguest_DEPS.freebsd  = \
-        $(PATH_TARGET)/pci_if.h \
-        $(PATH_TARGET)/bus_if.h \
-        $(PATH_TARGET)/device_if.h
+        $(PATH_vboxguest)/pci_if.h \
+        $(PATH_vboxguest)/bus_if.h \
+        $(PATH_vboxguest)/device_if.h
  vboxguest_CLEAN.freebsd = $(vboxguest_DEPS.freebsd)
 
@@ -104 +102 @@
  #
  VBOX_AWK := /usr/bin/awk
- $(PATH_TARGET)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m
+ $$(PATH_vboxguest)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m
         $(call MSG_TOOL,awk,VBoxGuest,$<,$@)
-        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_TARGET)/bus_if.m
-        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_TARGET)/bus_if.m -h -p
-        $(QUIET)$(RM) $(PATH_TARGET)/bus_if.m
+        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_vboxguest)/bus_if.m
+        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/bus_if.m -h -p
+        $(QUIET)$(RM) $(PATH_vboxguest)/bus_if.m
 
- $(PATH_TARGET)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m
+ $$(PATH_vboxguest)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m
         $(call MSG_TOOL,awk,VBoxGuest,$<,$@)
-        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_TARGET)/device_if.m
-        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_TARGET)/device_if.m -h -p
-        $(QUIET)$(RM) $(PATH_TARGET)/device_if.m
+        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_vboxguest)/device_if.m
+        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/device_if.m -h -p
+        $(QUIET)$(RM) $(PATH_vboxguest)/device_if.m
 
- $(PATH_TARGET)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m
+ $$(PATH_vboxguest)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m
         $(call MSG_TOOL,awk,VBoxGuest,$<,$@)
-        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m $(PATH_TARGET)/pci_if.m
-        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_TARGET)/pci_if.m -h -p
-        $(QUIET)$(RM) $(PATH_TARGET)/pci_if.m
+        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m $(PATH_vboxguest)/pci_if.m
+        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_vboxguest)/pci_if.m -h -p
+        $(QUIET)$(RM) $(PATH_vboxguest)/pci_if.m
 
 endif

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -103 +98 @@
         VBoxGuestR3LibGR.cpp \
         $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
-        VBoxGuestR3LibMisc.cpp  
+        VBoxGuestR3LibMisc.cpp
 endif
 

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -20 +20 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../../..
-else
-DEPTH    ?= ../../../../..
-SUB_DEPTH = ../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
-ifeq ($(KBUILD_HOST),os2)
- ifdef VBOX_WITH_OS2_ADDITIONS
-  PROGRAMS += VBoxService
- endif
-else
+if "$(KBUILD_HOST)" != "os2" || defined(VBOX_WITH_OS2_ADDITIONS)
  PROGRAMS += VBoxService
 endif
@@ -56 +47 @@
 VBoxService_LIBPATH.freebsd = \
         /usr/local/lib
+
 include $(KBUILD_PATH)/subfooter.kmk