Changeset 12247 in vbox for trunk/src

Timestamp:

Sep 9, 2008 1:13:58 AM (16 years ago)

Author:

vboxsync

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

36245

Message:

Runtime/Makefiles: eliminated PATH_TARGET, pushed them up to the root (sub-makefile wise).

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (7 diffs)
• testcase/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -29 +29 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../..
-else
-SUB_DEPTH = .
-DEPTH    ?= ../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -81 +76 @@
  LIBRARIES.l4 += RuntimeR3L4 RuntimeLnxHostR3
  DLLS += VBoxRT
- OTHER_CLEAN += \
-        $(PATH_TARGET)/errmsgdata.h \
-        $(PATH_TARGET)/errmsgcomdata.h \
-        $(PATH_TARGET)/Doxyfile.iprt \
-        $(PATH_TARGET)/Doxyfile.iprt.dep \
-        $(PATH_TARGET)/docs.iprt
-
-endif
+endif
+
+# Where the generated stuff goes.
+IPRT_OUT_DIR := $(PATH_TARGET)/Runtime
+BLDDIRS += $(IPRT_OUT_DIR)
+OTHER_CLEAN += \
+        $(IPRT_OUT_DIR)/errmsgdata.h \
+        $(IPRT_OUT_DIR)/errmsgcomdata.h \
+        $(IPRT_OUT_DIR)/Doxyfile.iprt \
+        $(IPRT_OUT_DIR)/Doxyfile.iprt.dep \
+        $(IPRT_OUT_DIR)/docs.iprt
 
 
@@ -1396 +1394 @@
 # errmsg.cpp depends on a generated header.
 #
-common/err/errmsg.cpp_DEPS = $(PATH_TARGET)/errmsgdata.h
-common/err/errmsg.cpp_INCS = $(PATH_TARGET)
-
-win/errmsgwin.cpp_DEPS = $(PATH_TARGET)/errmsgcomdata.h
-win/errmsgwin.cpp_INCS = $(PATH_TARGET)
+common/err/errmsg.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgdata.h
+common/err/errmsg.cpp_INCS = $(IPRT_OUT_DIR)
+
+win/errmsgwin.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgcomdata.h
+win/errmsgwin.cpp_INCS = $(IPRT_OUT_DIR)
 
 
@@ -1421 +1419 @@
 # Generate the status code data.
 #
-$(PATH_TARGET)/errmsgdata.h: \
+$(IPRT_OUT_DIR)/errmsgdata.h: \
                 $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \
                 $(PATH_ROOT)/include/iprt/err.h \
-                $(PATH_ROOT)/include/VBox/err.h
+                $(PATH_ROOT)/include/VBox/err.h \
+                | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$(filter %.h,$^))
-        $(QUIET)$(MKDIR) -p $(PATH_TARGET)
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
 
 ## @todo r=bird: rename this to indicate that it's not only COM errors, but all win32/64 errors.
-$(PATH_TARGET)/errmsgcomdata.h: \
+$(IPRT_OUT_DIR)/errmsgcomdata.h: \
                 $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsgcom.sed \
-                $$(PATH_SDK_WINPSDK_INC)/WinError.h
+                $$(PATH_SDK_WINPSDK_INC)/WinError.h \
+                | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$(filter %.h,$^))
-        $(QUIET)$(MKDIR) -p $(PATH_TARGET)
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
 
@@ -1496 +1494 @@
 IPRT_DOXYFILE_OUTPUT = $(PATH_OUT)/docs/iprt
 
--include $(PATH_TARGET)/Doxyfile.iprt.dep
+includedep $(IPRT_OUT_DIR)/Doxyfile.iprt.dep
 
 # Generate the Doxyfile
-$(PATH_TARGET)/Doxyfile.iprt: \
+$(IPRT_OUT_DIR)/Doxyfile.iprt: \
                 $(VBOX_PATH_RUNTIME_SRC)/Doxyfile \
                 $(VBOX_PATH_RUNTIME_SRC)/Makefile.kmk \
                 $(comp-vars IPRT_DOXYFILE_INPUT,DOXYGEN_INPUT_PREV,FORCE) \
                 $(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \
-                | $(call DIRDEP, $(PATH_TARGET))
-        $(RM) -f $@ [email protected] $(PATH_TARGET)/Doxyfile.iprt.dep
+                | $$(dir $$@)
+        $(RM) -f $@ [email protected] $@.dep
         $(CP) -f $(VBOX_PATH_RUNTIME_SRC)/Doxyfile [email protected]
         $(APPEND) [email protected]
@@ -1517 +1515 @@
         $(APPEND) [email protected]
         $(MV) -f [email protected] $@
-        @$(APPEND) $(PATH_TARGET)/Doxyfile.iprt.dep "DOXYGEN_OUTPUT_PREV = $(IPRT_DOXYFILE_OUTPUT)"
-        @$(APPEND) $(PATH_TARGET)/Doxyfile.iprt.dep "DOXYGEN_INPUT_PREV = $(IPRT_DOXYFILE_INPUT)"
+        @$(APPEND) $@.dep "DOXYGEN_OUTPUT_PREV = $(IPRT_DOXYFILE_OUTPUT)"
+        @$(APPEND) $@.dep "DOXYGEN_INPUT_PREV = $(IPRT_DOXYFILE_INPUT)"
 
 # Create the output directory.
@@ -1525 +1523 @@
 
 # Do the actual job.
-$(PATH_TARGET)/docs.iprt: $(PATH_TARGET)/Doxyfile.iprt $(IPRT_DOXYFILE_INPUT) | $(call DIRDEP, $(IPRT_DOXYFILE_OUTPUT))
-        $(RM) -f $(wildcard $(IPRT_DOXYFILE_OUTPUT)/html/*) $(PATH_TARGET)/docs.iprt
-        doxygen $(PATH_TARGET)/Doxyfile.iprt
-        $(APPEND) $(PATH_TARGET)/docs.iprt
+$(IPRT_OUT_DIR)/docs.iprt: $(IPRT_OUT_DIR)/Doxyfile.iprt $(IPRT_DOXYFILE_INPUT) | $(call DIRDEP, $(IPRT_DOXYFILE_OUTPUT))
+        $(RM) -f $(wildcard $(IPRT_DOXYFILE_OUTPUT)/html/*) $(IPRT_OUT_DIR)/docs.iprt
+        doxygen $(IPRT_OUT_DIR)/Doxyfile.iprt
+        $(APPEND) $(IPRT_OUT_DIR)/docs.iprt
 
 # alias
-docs: $(PATH_TARGET)/docs.iprt
+docs: $(IPRT_OUT_DIR)/docs.iprt
 
 test:

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -29 +29 @@
 #
 
-ifdef VBOX_SINGLE_MAKEFILE
 SUB_DEPTH = ../../../..
-else
-SUB_DEPTH = ..
-DEPTH    ?= ../../../..
-endif
 include $(KBUILD_PATH)/subheader.kmk
 
@@ -45 +40 @@
 #
 TEMPLATE = VBOXR3TSTEXE
+
+# Defined by the parent makefile as well (for errmsgdata.h).
+IPRT_OUT_DIR ?= $(PATH_TARGET)/Runtime
 
 
@@ -149 +147 @@
 # Note: tstErrUnique.cpp depends on a header generated by the makefile above us.
 tstErrUnique_SOURCES = tstErrUnique.cpp
-tstErrUnique_INCS = $(PATH_TARGET)/
-tstErrUnique.cpp_DEPS = $(PATH_TARGET)/errmsgdata.h
+tstErrUnique_INCS = $(IPRT_OUT_DIR)/
+tstErrUnique.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgdata.h
 
 tstFile_SOURCES = tstFile.cpp