Changeset 10225 in vbox

Timestamp:

Jul 4, 2008 1:04:58 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_SINGLE_MAKEFILE fixes.

Location:

trunk/src/VBox

Files:

• Main/Makefile.kmk (modified) (1 diff)
• Runtime/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -108 +108 @@
 
 $(PATH_TARGET)/docs.Main: \
-                Doxyfile.Main \
-                idl/doxygen.xsl \
-                idl/VirtualBox.xidl \
+                $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main \
+                $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl \
+                $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl \
                 | $(call DIRDEP, $(PATH_TARGET)) \
                   $(call DIRDEP, $(PATH_OUT)/docs/Main)
         $(RM) -f $(wildcard $(PATH_OUT)/docs/Main/html/*)
-        $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl idl/doxygen.xsl idl/VirtualBox.xidl
+        $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl
         $(REDIRECT) -E 'PATH_OUT=$(PATH_OUT)' -E 'PATH_TARGET=$(PATH_TARGET)' -E 'PATH_CHM=$(subst /,\,$(PATH_BIN)/VirtualBoxAPI.chm)' \
-                -- doxygen Doxyfile.Main
+                -- doxygen $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main
         -$(EXEC_X86_WIN32) $(VBOX_PATH_HTML_HELP_WORKSHOP)/hhc.exe $(subst /,\\,$(PATH_OUT)/docs/Main/html/index.hhp)
         $(APPEND) $(PATH_TARGET)/docs.Main

trunk/src/VBox/Runtime/Makefile.kmk

@@ -77 +77 @@
         $(PATH_TARGET)/errmsgdata.h \
         $(PATH_TARGET)/errmsgcomdata.h \
-        $(PATH_TARGET)/Doxyfile \
-        $(PATH_TARGET)/Doxyfile.dep \
+        $(PATH_TARGET)/Doxyfile.iprt \
+        $(PATH_TARGET)/Doxyfile.iprt.dep \
         $(PATH_TARGET)/docs.iprt
 
@@ -1369 +1369 @@
 # Doxygen documentation.
 #
-DOXYGEN_INPUT_DIRS = \
+IPRT_DOXYFILE_INPUT_DIRS = \
         $(PATH_ROOT)/include/iprt \
         $(PATH_ROOT)/include/iprt/nocrt \
@@ -1399 +1399 @@
 
 # These must come first in order to make things look nice.
-DOXYGEN_INPUT_FIRST =\
+IPRT_DOXYFILE_INPUT_FIRST =\
         $(PATH_ROOT)/include/iprt/cdefs.h \
         $(PATH_ROOT)/include/iprt/types.h \
@@ -1407 +1407 @@
         $(PATH_ROOT)/include/iprt/asm.h \
 
-DOXYGEN_INPUT := \
-        $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(DOXYGEN_INPUT_DIRS)))) ) \
-        $(foreach dir, $(DOXYGEN_INPUT_DIRS), $(wildcard $(dir)/*.cpp $(dir)/.c $(dir)/.asm))
-DOXYGEN_INPUT := \
-        $(DOXYGEN_INPUT_FIRST) \
-        $(filter-out $(DOXYGEN_INPUT_FIRST), $(DOXYGEN_INPUT))
-
-
-DOXYGEN_OUTPUT = $(PATH_OUT)/docs/iprt
-
--include $(PATH_TARGET)/Doxyfile.dep
+IPRT_DOXYFILE_INPUT := \
+        $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(IPRT_DOXYFILE_INPUT_DIRS)))) ) \
+        $(foreach dir, $(IPRT_DOXYFILE_INPUT_DIRS), $(wildcard $(dir)/*.cpp $(dir)/.c $(dir)/.asm))
+IPRT_DOXYFILE_INPUT := \
+        $(IPRT_DOXYFILE_INPUT_FIRST) \
+        $(filter-out $(IPRT_DOXYFILE_INPUT_FIRST), $(IPRT_DOXYFILE_INPUT))
+
+
+IPRT_DOXYFILE_OUTPUT = $(PATH_OUT)/docs/iprt
+
+-include $(PATH_TARGET)/Doxyfile.iprt.dep
 
 # Generate the Doxyfile
-$(PATH_TARGET)/Doxyfile: $(VBOX_PATH_RUNTIME_SRC)/Doxyfile $(VBOX_PATH_RUNTIME_SRC)/Makefile.kmk \
-                $(comp-vars DOXYGEN_INPUT,DOXYGEN_INPUT_PREV,FORCE) \
-                $(comp-vars DOXYGEN_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \
+$(PATH_TARGET)/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.dep
+        $(RM) -f $@ [email protected] $(PATH_TARGET)/Doxyfile.iprt.dep
         $(CP) -f $(VBOX_PATH_RUNTIME_SRC)/Doxyfile [email protected]
         $(APPEND) [email protected]
-        $(APPEND) [email protected] "OUTPUT_DIRECTORY = $(DOXYGEN_OUTPUT)"
-        $(APPEND) [email protected] "WARN_LOGFILE = $(DOXYGEN_OUTPUT)/errors"
+        $(APPEND) [email protected] "OUTPUT_DIRECTORY = $(IPRT_DOXYFILE_OUTPUT)"
+        $(APPEND) [email protected] "WARN_LOGFILE = $(IPRT_DOXYFILE_OUTPUT)/errors"
         $(APPEND) [email protected] "INCLUDE_PATH = $(PATH_ROOT)/include include . common/table"
         $(APPEND) [email protected] "INCLUDE_FILE_PATTERNS = *.cpp.h"
         $(APPEND) [email protected] "PREDEFINED += $(ARCH_BITS_DEFS)"
         $(APPEND) [email protected]
-        $(APPEND) [email protected] "INPUT = $(DOXYGEN_INPUT)"
+        $(APPEND) [email protected] "INPUT = $(IPRT_DOXYFILE_INPUT)"
         $(APPEND) [email protected]
         $(MV) -f [email protected] $@
-        @$(APPEND) $(PATH_TARGET)/Doxyfile.dep "DOXYGEN_OUTPUT_PREV = $(DOXYGEN_OUTPUT)"
-        @$(APPEND) $(PATH_TARGET)/Doxyfile.dep "DOXYGEN_INPUT_PREV = $(DOXYGEN_INPUT)"
+        @$(APPEND) $(PATH_TARGET)/Doxyfile.iprt.dep "DOXYGEN_OUTPUT_PREV = $(IPRT_DOXYFILE_OUTPUT)"
+        @$(APPEND) $(PATH_TARGET)/Doxyfile.iprt.dep "DOXYGEN_INPUT_PREV = $(IPRT_DOXYFILE_INPUT)"
 
 # Create the output directory.
-$(call DIRDEP, $(DOXYGEN_OUTPUT)):
+$(call DIRDEP, $(IPRT_DOXYFILE_OUTPUT)):
         $(MKDIR) -p $@
 
 # Do the actual job.
-$(PATH_TARGET)/docs.iprt: $(PATH_TARGET)/Doxyfile $(DOXYGEN_INPUT) | $(call DIRDEP, $(DOXYGEN_OUTPUT))
-        $(RM) -f $(wildcard $(DOXYGEN_OUTPUT)/html/*) $(PATH_TARGET)/docs.iprt
-        doxygen $(PATH_TARGET)/Doxyfile
+$(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
 
@@ -1453 +1455 @@
 
 test:
-        @echo test-$(comp-vars DOXYGEN_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE)
-        @echo $(DOXYGEN_OUTPUT)
+        @echo test-$(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE)
+        @echo $(IPRT_DOXYFILE_OUTPUT)
         @echo $(DOXYGEN_OUTPUT_PREV)
-        @echo $(DOXYGEN_INPUT)
-
+        @echo $(IPRT_DOXYFILE_INPUT)
+