Changeset 22569 in vbox for trunk/src

Timestamp:

Aug 28, 2009 9:16:44 PM (16 years ago)

Author:

vboxsync

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

51596

Message:

Generated FreeBSD kernel headers, take 2. *click*

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (3 diffs)
• Runtime/Makefile.kmk (modified) (2 diffs)

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

@@ -43 +43 @@
  VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
  VBoxGuest_INCS          = .
- VBoxGuest_INCS.freebsd  = $(PATH_VBoxGuest)
+ VBoxGuest_INCS.freebsd  = $(PATH_VBoxGuest) $(PATH_OUT)/gen-sys-hdrs
  VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  ifneq ($(KBUILD_TARGET),os2)
@@ -52 +52 @@
   endif
   VBoxGuest_SOURCES     += VBoxGuest.cpp
-  VBoxGuest_LIBS          = \
+  VBoxGuest_LIBS         = \
         $(VBOX_LIB_VBGL_R0BASE) \
         $(VBOX_LIB_IPRT_GUEST_R0)
   VBoxGuest_INTERMEDIATES.freebsd = \
-        $(PATH_VBoxGuest)/pci_if.h \
-        $(PATH_VBoxGuest)/bus_if.h \
-        $(PATH_VBoxGuest)/device_if.h
-  VBoxGuest_CLEAN.freebsd = $(VBoxGuest_INTERMEDIATES.freebsd)
+        $(PATH_OUT)/gen-sys-hdrs/pci_if.h \
+        $(PATH_OUT)/gen-sys-hdrs/bus_if.h \
+        $(PATH_OUT)/gen-sys-hdrs/device_if.h
 
  else # OS/2:
@@ -89 +88 @@
         VBoxGuest.cpp
  endif # OS/2
-
- ifeq ($(KBUILD_TARGET),freebsd)
-  #
-  # FreeBSD: Genereate bus, device and pci interface headers. (explain why)
-  #
-  # We cannot give a output path to the awk program, it will always generate
-  # the header next to the source. So, we'll have to temporarily copy the
-  # source file to the destination direction for it to work out correctly.
-  #
-  VBOX_AWK := /usr/bin/awk
-  $$(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_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_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_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_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_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 # FreeBSD
 
 endif # enabled

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1382 +1382 @@
         r0drv/memobj-r0drv.cpp \
         r0drv/powernotification-r0drv.c
-RuntimeR0Drv_DEPS.freebsd = \
-        $(PATH_RuntimeR0Drv)/bus_if.h \
-        $(PATH_RuntimeR0Drv)/device_if.h
-RuntimeR0Drv_CLEAN.freebsd = $(RuntimeR0Drv_DEPS.freebsd)
-RuntimeR0Drv_INCS.freebsd += $(PATH_RuntimeR0Drv)
-
- if "$(KBUILD_TARGET)" == "freebsd" && $(intersects RuntimeR0Drv,$(LIBRARIES))
-  #
-  # FreeBSD: Generate bus and device interface headers.
-  # We have to include headers for the RTMp* API which
-  # depends on these files.
-  #
-  # We cannot give a output path to the awk program, it will always generate
-  # the header next to the source. So, we'll have to temporarily copy the
-  # source file to the destination directory to work.
-  #
-  ## @todo Create an install target for this and install it to gen-sys-hdrs/, user order deps to force RuntimeR0Drv to build it. Use it for the other drivers as well.
-  VBOX_AWK := /usr/bin/awk
-  $$(PATH_RuntimeR0Drv)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m | $$(dir $$@)
-        $(call MSG_TOOL,awk,RuntimeR0Drv,$<,$@)
-        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/bus_if.m $(PATH_RuntimeR0Drv)/bus_if.m
-        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_RuntimeR0Drv)/bus_if.m -h -p
-        $(QUIET)$(RM) $(PATH_RuntimeR0Drv)/bus_if.m
-
-  $$(PATH_RuntimeR0Drv)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m | $$(dir $$@)
-        $(call MSG_TOOL,awk,RuntimeR0Drv,$<,$@)
-        $(QUIET)$(CP) -f $(VBOX_FREEBSD_SRC)/kern/device_if.m $(PATH_RuntimeR0Drv)/device_if.m
-        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(PATH_RuntimeR0Drv)/device_if.m -h -p
-        $(QUIET)$(RM) $(PATH_RuntimeR0Drv)/device_if.m
- endif # FreeBSD + RuntimeR0Drv being built.
+RuntimeR0Drv_INTERMEDIATES.freebsd = \
+        $(PATH_OUT)/gen-sys-hdrs/bus_if.h \
+        $(PATH_OUT)/gen-sys-hdrs/device_if.h
+RuntimeR0Drv_INCS.freebsd += \
+        $(PATH_OUT)/gen-sys-hdrs
 
 RuntimeR0Drv_SOURCES.solaris = \
@@ -1683 +1658 @@
 
 
+if "$(KBUILD_TARGET)" == "freebsd"
+#
+# FreeBSDGeneratedKernelHeaders - Generate some kernel interface headers.
+#
+# These are used by:
+#      - The RTMp* API in IPRT.
+#      - VBoxGuest
+#
+# Note! We cannot give a output path to the awk program, it will always
+# generate the header next to the source. So, we'll have to temporarily copy
+# the source file to the destination directory to work.
+#
+VBOX_AWK := /usr/bin/awk
+INSTALLS += FreeBSDGeneratedKernelHeaders
+FreeBSDGeneratedKernelHeaders_INST = gen-sys-hdrs/
+FreeBSDGeneratedKernelHeaders_SOURCES = \
+        $(FreeBSDGeneratedKernelHeaders_0_OUTDIR)/bus_if.h \
+        $(FreeBSDGeneratedKernelHeaders_0_OUTDIR)/device_if.h \
+        $(FreeBSDGeneratedKernelHeaders_0_OUTDIR)/pci_if.h
+FreeBSDGeneratedKernelHeaders_CLEAN = $(FreeBSDGeneratedKernelHeaders_SOURCES)
+
+$$(FreeBSDGeneratedKernelHeaders_0_OUTDIR)/bus_if.h: $(VBOX_FREEBSD_SRC)/kern/bus_if.m | $$(dir $$@)
+        $(call MSG_TOOL,awk,FreeBSDGeneratedKernelHeaders,$<,$@)
+        $(QUIET)$(CP) -f $< $(@)/bus_if.m
+        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(@D)/bus_if.m -h -p
+        $(QUIET)$(RM) $(@D)/bus_if.m
+
+$$(FreeBSDGeneratedKernelHeaders_0_OUTDIR)/device_if.h: $(VBOX_FREEBSD_SRC)/kern/device_if.m | $$(dir $$@)
+        $(call MSG_TOOL,awk,FreeBSDGeneratedKernelHeaders,$<,$@)
+        $(QUIET)$(CP) -f $< $(@D)/device_if.m
+        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(@D)/device_if.m -h -p
+        $(QUIET)$(RM) $(@D)/device_if.m
+
+$$(FreeBSDGeneratedKernelHeaders_0_OUTDIR)/pci_if.h: $(VBOX_FREEBSD_SRC)/dev/pci/pci_if.m
+        $(call MSG_TOOL,awk,FreeBSDGeneratedKernelHeaders,$<,$@)
+        $(QUIET)$(CP) -f $< $(@D)/pci_if.m
+        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/makeobjops.awk $(@D)/pci_if.m -h -p
+        $(QUIET)$(RM) $(@D)/pci_if.m
+endif # FreeBSD
+
+
 #
 # Aliases for .cpp.h files so we can more easily do syntax checking from the editor.