Changeset 6759 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Feb 2, 2008 9:44:51 AM (17 years ago)

Author:

vboxsync

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

27841

Message:

Converted all but VirtualBox/Makefile.kmk to sub-makefiles.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (2 diffs)
• VideoCapture/Makefile.kmk (modified) (3 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)

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

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the headless frontend.
+# Sub-Makefile for the headless frontend.
 #
 
@@ -16 +16 @@
 #
 
-DEPTH = ../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../..
+SUB_DEPTH = ..
+include $(PATH_KBUILD)/subheader.kmk
 
-PROGRAMS                = VBoxHeadless
-SUBDIRS_AFTER           = testcase
+PROGRAMS += VBoxHeadless
+include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+ifdef VBOX_WITH_FFMPEG
+ include $(PATH_SUB_CURRENT)/VideoCapture/Makefile.kmk
+endif
 
 VBoxHeadless_TEMPLATE   = VBOXMAINCLIENTEXE
+VBoxHeadless_DEFS       = VBOX_FFMPEG
 VBoxHeadless_SOURCES    = VBoxHeadless.cpp
-VBoxHeadless_DEFS       = VBOX_FFMPEG
-
 ifdef VBOX_WITH_VRDP
-VBoxHeadless_SOURCES   += Framebuffer.cpp
-VBoxHeadless_DEFS      += VBOX_WITH_VRDP
+ VBoxHeadless_DEFS     += VBOX_WITH_VRDP
+ VBoxHeadless_SOURCES  += Framebuffer.cpp
 endif
 
-ifdef VBOX_WITH_FFMPEG
- SUBDIRS += VideoCapture
-endif
+include $(PATH_KBUILD)/subfooter.kmk
 
-include $(PATH_KBUILD)/footer.kmk
-

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the ffmpeg frame buffer module.
+# Sub-Makefile for the ffmpeg frame buffer module.
 #
 
@@ -16 +16 @@
 #
 
-DEPTH = ../../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../../..
+SUB_DEPTH = ../..
+include $(PATH_KBUILD)/subheader.kmk
 
-DLLS                         = VBoxFFmpegFB
+DLLS += VBoxFFmpegFB
 VBoxFFmpegFB_TEMPLATE        = VBOXMAINCLIENTDLL
 VBoxFFmpegFB_SDKS            = VBOX_FFMPEG VBOX_LIBPNG VBOX_ZLIB
@@ -25 +26 @@
 VBoxFFmpegFB_CXXFLAGS.linux += -fPIC
 
-include $(PATH_KBUILD)/footer.kmk
+include $(PATH_KBUILD)/subfooter.kmk
 

trunk/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Makefile for the VRDP (headless RDP server) frontend testcase.
+# Sub-Makefile for the VRDP (headless RDP server) frontend testcase.
 #
 
@@ -16 +16 @@
 #
 
-DEPTH = ../../../../..
-include $(PATH_KBUILD)/header.kmk
+DEPTH ?= ../../../../..
+SUB_DEPTH = ../..
+include $(PATH_KBUILD)/subheader.kmk
 
 ifdef VBOX_WITH_TESTCASES
-PROGRAMS = tstHeadless
+ PROGRAMS += tstHeadless2
 endif
 
-tstHeadless_TEMPLATE = VBOXMAINCLIENTEXE
-tstHeadless_SOURCES  = tstHeadless.cpp
+tstHeadless2_TEMPLATE = VBOXMAINCLIENTEXE
+tstHeadless2_SOURCES  = tstHeadless.cpp
 
-include $(PATH_KBUILD)/footer.kmk
+include $(PATH_KBUILD)/subfooter.kmk