VirtualBox

Changeset 10226

Show
Ignore:
Timestamp:
07/04/08 15:05:24 (3 months ago)
Author:
vboxsync
Message:

VBOX_SINGLE_MAKEFILE fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile.kmk

    r10195 r10226  
    219219# 
    220220OTHER_CLEAN += \ 
    221         $(PATH_TARGET)/Doxyfile \ 
    222         $(PATH_TARGET)/Doxyfile.dep 
    223  
    224 DOXYGEN_INPUT_DIRS = \ 
     221        $(PATH_TARGET)/Doxyfile.Core \ 
     222        $(PATH_TARGET)/Doxyfile.Core.dep 
     223 
     224VBOX_CORE_DOXYFILE_INPUT_DIRS = \ 
    225225        include/iprt \ 
    226226        include/VBox \ 
    …… 
    318318 
    319319# These must come first in order to make things look nice. 
    320 DOXYGEN_INPUT_FIRST =\ 
     320VBOX_CORE_DOXYFILE_INPUT_FIRST =\ 
    321321        $(PATH_ROOT)/doc/VBox-doc.c \ 
    322322        $(PATH_ROOT)/doc/VBox-CodingGuidelines.cpp \ 
    …… 
    390390        $(PATH_ROOT)/include/VBox/version.h 
    391391 
    392 DOXYGEN_INPUT := \ 
    393         $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(DOXYGEN_INPUT_DIRS)))) ) \ 
    394         $(foreach dir, $(DOXYGEN_INPUT_DIRS), $(wildcard $(dir)/*.cpp $(dir)/*.c $(dir)/.asm)) 
    395 DOXYGEN_INPUT := \ 
    396         $(DOXYGEN_INPUT_FIRST) \ 
    397         $(filter-out $(DOXYGEN_INPUT_FIRST), $(DOXYGEN_INPUT)) 
     392VBOX_CORE_DOXYFILE_INPUT := \ 
     393        $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(VBOX_CORE_DOXYFILE_INPUT_DIRS)))) ) \ 
     394        $(foreach dir, $(VBOX_CORE_DOXYFILE_INPUT_DIRS), $(wildcard $(dir)/*.cpp $(dir)/*.c $(dir)/.asm)) 
     395VBOX_CORE_DOXYFILE_INPUT := \ 
     396        $(VBOX_CORE_DOXYFILE_INPUT_FIRST) \ 
     397        $(filter-out $(VBOX_CORE_DOXYFILE_INPUT_FIRST), $(VBOX_CORE_DOXYFILE_INPUT)) 
    398398 
    399399# And some some additional stuff. 
    400 DOXYGEN_INPUT += \ 
     400VBOX_CORE_DOXYFILE_INPUT += \ 
    401401        $(PATH_ROOT)/src/recompiler/VBoxRecompiler.c \ 
    402402        $(PATH_ROOT)/src/recompiler/VBoxREMWrapper.cpp 
    403403 
    404404 
    405 DOXYGEN_OUTPUT = $(PATH_OUT)/docs/Core 
    406  
    407 -include $(PATH_TARGET)/Doxyfile.dep 
     405VBOX_CORE_DOXYFILE_OUTPUT = $(PATH_OUT)/docs/Core 
     406 
     407-include $(PATH_TARGET)/Doxyfile.Core.dep 
    408408 
    409409# Generate the Doxyfile 
    410 $(PATH_TARGET)/Doxyfile: Doxyfile.Core \ 
    411                 $(comp-vars DOXYGEN_INPUT,DOXYGEN_INPUT_PREV,FORCE) \ 
    412                 $(comp-vars DOXYGEN_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \ 
     410$(PATH_TARGET)/Doxyfile.Core: Doxyfile.Core \ 
     411                $(comp-vars VBOX_CORE_DOXYFILE_INPUT,DOXYGEN_INPUT_PREV,FORCE) \ 
     412                $(comp-vars VBOX_CORE_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \ 
    413413                | $(call DIRDEP, $(PATH_TARGET)) 
    414         $(RM) -f $@ $@.tmp $(PATH_TARGET)/Doxyfile.dep 
     414        $(RM) -f $@ $@.tmp $(PATH_TARGET)/Doxyfile.Core.dep 
    415415        $(CP) -f Doxyfile.Core $@.tmp 
    416416        $(APPEND) $@.tmp 
    417         $(APPEND) $@.tmp "OUTPUT_DIRECTORY = $(DOXYGEN_OUTPUT)" 
    418         $(APPEND) $@.tmp "WARN_LOGFILE = $(DOXYGEN_OUTPUT)/errors" 
     417        $(APPEND) $@.tmp "OUTPUT_DIRECTORY = $(VBOX_CORE_DOXYFILE_OUTPUT)" 
     418        $(APPEND) $@.tmp "WARN_LOGFILE = $(VBOX_CORE_DOXYFILE_OUTPUT)/errors" 
    419419        $(APPEND) $@.tmp "INCLUDE_PATH = $(PATH_ROOT)/include $(PATH_ROOT)/src/VBox/VMM $(PATH_ROOT)/src/VBox/Main/include " 
    420420        $(APPEND) $@.tmp "INCLUDE_FILE_PATTERNS = *.cpp.h" 
    421421        $(APPEND) $@.tmp 
    422         $(APPEND) $@.tmp "INPUT = $(DOXYGEN_INPUT)" 
     422        $(APPEND) $@.tmp "INPUT = $(VBOX_CORE_DOXYFILE_INPUT)" 
    423423        $(APPEND) $@.tmp 
    424424        $(APPEND) $@.tmp "PREDEFINED += $(DEFS) $(DEFS.$(KBUILD_TARGET)) $(DEFS.$(KBUILD_TARGET_ARCH)) $(ARCH_BITS_DEFS)" 
    …… 
    426426        $(APPEND) $@.tmp 
    427427        $(MV) -f $@.tmp $@ 
    428         @$(APPEND) $(PATH_TARGET)/Doxyfile.dep "DOXYGEN_OUTPUT_PREV = $(DOXYGEN_OUTPUT)" 
    429         @$(APPEND) $(PATH_TARGET)/Doxyfile.dep "DOXYGEN_INPUT_PREV = $(DOXYGEN_INPUT)" 
     428        @$(APPEND) $(PATH_TARGET)/Doxyfile.Core.dep "DOXYGEN_OUTPUT_PREV = $(VBOX_CORE_DOXYFILE_OUTPUT)" 
     429        @$(APPEND) $(PATH_TARGET)/Doxyfile.Core.dep "DOXYGEN_INPUT_PREV = $(VBOX_CORE_DOXYFILE_INPUT)" 
    430430 
    431431# Create the output directory. 
    432 $(call DIRDEP, $(DOXYGEN_OUTPUT)): 
     432$(call DIRDEP, $(VBOX_CORE_DOXYFILE_OUTPUT)): 
    433433        $(MKDIR) -p $@ 
    434434 
    435435# Do the actual job. 
    436 $(PATH_TARGET)/docs.Core: $(PATH_TARGET)/Doxyfile $(DOXYGEN_INPUT) | $(call DIRDEP, $(DOXYGEN_OUTPUT)) 
     436$(PATH_TARGET)/docs.Core: $(PATH_TARGET)/Doxyfile.Core $(VBOX_CORE_DOXYFILE_INPUT) | $(call DIRDEP, $(VBOX_CORE_DOXYFILE_OUTPUT)) 
    437437        $(RM) -f $(PATH_TARGET)/docs.Core 
    438         $(RM) -Rf $(DOXYGEN_OUTPUT)/html/ 
    439         doxygen $(PATH_TARGET)/Doxyfile 
     438        $(RM) -Rf $(VBOX_CORE_DOXYFILE_OUTPUT)/html/ 
     439        doxygen $(PATH_TARGET)/Doxyfile.Core 
    440440        $(APPEND) $(PATH_TARGET)/docs.Core 
    441441 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy