VirtualBox

Changeset 10225

Show
Ignore:
Timestamp:
07/04/08 15:04:58 (2 months ago)
Author:
vboxsync
Message:

VBOX_SINGLE_MAKEFILE fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/VBox/Main/Makefile.kmk

    r10199 r10225  
    108108 
    109109$(PATH_TARGET)/docs.Main: \ 
    110                 Doxyfile.Main \ 
    111                 idl/doxygen.xsl \ 
    112                 idl/VirtualBox.xidl \ 
     110                $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main \ 
     111                $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl \ 
     112                $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl \ 
    113113                | $(call DIRDEP, $(PATH_TARGET)) \ 
    114114                  $(call DIRDEP, $(PATH_OUT)/docs/Main) 
    115115        $(RM) -f $(wildcard $(PATH_OUT)/docs/Main/html/*) 
    116         $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl idl/doxygen.xsl idl/VirtualBox.xidl 
     116        $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl $(VBOX_PATH_MAIN_SRC)/idl/doxygen.xsl $(VBOX_PATH_MAIN_SRC)/idl/VirtualBox.xidl 
    117117        $(REDIRECT) -E 'PATH_OUT=$(PATH_OUT)' -E 'PATH_TARGET=$(PATH_TARGET)' -E 'PATH_CHM=$(subst /,\,$(PATH_BIN)/VirtualBoxAPI.chm)' \ 
    118                 -- doxygen Doxyfile.Main 
     118                -- doxygen $(VBOX_PATH_MAIN_SRC)/Doxyfile.Main 
    119119        -$(EXEC_X86_WIN32) $(VBOX_PATH_HTML_HELP_WORKSHOP)/hhc.exe $(subst /,\\,$(PATH_OUT)/docs/Main/html/index.hhp) 
    120120        $(APPEND) $(PATH_TARGET)/docs.Main 
  • trunk/src/VBox/Runtime/Makefile.kmk

    r10177 r10225  
    7777        $(PATH_TARGET)/errmsgdata.h \ 
    7878        $(PATH_TARGET)/errmsgcomdata.h \ 
    79         $(PATH_TARGET)/Doxyfile
    80         $(PATH_TARGET)/Doxyfile.dep \ 
     79        $(PATH_TARGET)/Doxyfile.iprt
     80        $(PATH_TARGET)/Doxyfile.iprt.dep \ 
    8181        $(PATH_TARGET)/docs.iprt 
    8282 
     
    13691369# Doxygen documentation. 
    13701370# 
    1371 DOXYGEN_INPUT_DIRS = \ 
     1371IPRT_DOXYFILE_INPUT_DIRS = \ 
    13721372        $(PATH_ROOT)/include/iprt \ 
    13731373        $(PATH_ROOT)/include/iprt/nocrt \ 
     
    13991399 
    14001400# These must come first in order to make things look nice. 
    1401 DOXYGEN_INPUT_FIRST =\ 
     1401IPRT_DOXYFILE_INPUT_FIRST =\ 
    14021402        $(PATH_ROOT)/include/iprt/cdefs.h \ 
    14031403        $(PATH_ROOT)/include/iprt/types.h \ 
     
    14071407        $(PATH_ROOT)/include/iprt/asm.h \ 
    14081408 
    1409 DOXYGEN_INPUT := \ 
    1410         $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(DOXYGEN_INPUT_DIRS)))) ) \ 
    1411         $(foreach dir, $(DOXYGEN_INPUT_DIRS), $(wildcard $(dir)/*.cpp $(dir)/.c $(dir)/.asm)) 
    1412 DOXYGEN_INPUT := \ 
    1413         $(DOXYGEN_INPUT_FIRST) \ 
    1414         $(filter-out $(DOXYGEN_INPUT_FIRST), $(DOXYGEN_INPUT)) 
    1415  
    1416  
    1417 DOXYGEN_OUTPUT = $(PATH_OUT)/docs/iprt 
    1418  
    1419 -include $(PATH_TARGET)/Doxyfile.dep 
     1409IPRT_DOXYFILE_INPUT := \ 
     1410        $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(IPRT_DOXYFILE_INPUT_DIRS)))) ) \ 
     1411        $(foreach dir, $(IPRT_DOXYFILE_INPUT_DIRS), $(wildcard $(dir)/*.cpp $(dir)/.c $(dir)/.asm)) 
     1412IPRT_DOXYFILE_INPUT := \ 
     1413        $(IPRT_DOXYFILE_INPUT_FIRST) \ 
     1414        $(filter-out $(IPRT_DOXYFILE_INPUT_FIRST), $(IPRT_DOXYFILE_INPUT)) 
     1415 
     1416 
     1417IPRT_DOXYFILE_OUTPUT = $(PATH_OUT)/docs/iprt 
     1418 
     1419-include $(PATH_TARGET)/Doxyfile.iprt.dep 
    14201420 
    14211421# Generate the Doxyfile 
    1422 $(PATH_TARGET)/Doxyfile: $(VBOX_PATH_RUNTIME_SRC)/Doxyfile $(VBOX_PATH_RUNTIME_SRC)/Makefile.kmk \ 
    1423                 $(comp-vars DOXYGEN_INPUT,DOXYGEN_INPUT_PREV,FORCE) \ 
    1424                 $(comp-vars DOXYGEN_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \ 
     1422$(PATH_TARGET)/Doxyfile.iprt: \ 
     1423                $(VBOX_PATH_RUNTIME_SRC)/Doxyfile \ 
     1424                $(VBOX_PATH_RUNTIME_SRC)/Makefile.kmk \ 
     1425                $(comp-vars IPRT_DOXYFILE_INPUT,DOXYGEN_INPUT_PREV,FORCE) \ 
     1426                $(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) \ 
    14251427                | $(call DIRDEP, $(PATH_TARGET)) 
    1426         $(RM) -f $@ $@.tmp $(PATH_TARGET)/Doxyfile.dep 
     1428        $(RM) -f $@ $@.tmp $(PATH_TARGET)/Doxyfile.iprt.dep 
    14271429        $(CP) -f $(VBOX_PATH_RUNTIME_SRC)/Doxyfile $@.tmp 
    14281430        $(APPEND) $@.tmp 
    1429         $(APPEND) $@.tmp "OUTPUT_DIRECTORY = $(DOXYGEN_OUTPUT)" 
    1430         $(APPEND) $@.tmp "WARN_LOGFILE = $(DOXYGEN_OUTPUT)/errors" 
     1431        $(APPEND) $@.tmp "OUTPUT_DIRECTORY = $(IPRT_DOXYFILE_OUTPUT)" 
     1432        $(APPEND) $@.tmp "WARN_LOGFILE = $(IPRT_DOXYFILE_OUTPUT)/errors" 
    14311433        $(APPEND) $@.tmp "INCLUDE_PATH = $(PATH_ROOT)/include include . common/table" 
    14321434        $(APPEND) $@.tmp "INCLUDE_FILE_PATTERNS = *.cpp.h" 
    14331435        $(APPEND) $@.tmp "PREDEFINED += $(ARCH_BITS_DEFS)" 
    14341436        $(APPEND) $@.tmp 
    1435         $(APPEND) $@.tmp "INPUT = $(DOXYGEN_INPUT)" 
     1437        $(APPEND) $@.tmp "INPUT = $(IPRT_DOXYFILE_INPUT)" 
    14361438        $(APPEND) $@.tmp 
    14371439        $(MV) -f $@.tmp $@ 
    1438         @$(APPEND) $(PATH_TARGET)/Doxyfile.dep "DOXYGEN_OUTPUT_PREV = $(DOXYGEN_OUTPUT)" 
    1439         @$(APPEND) $(PATH_TARGET)/Doxyfile.dep "DOXYGEN_INPUT_PREV = $(DOXYGEN_INPUT)" 
     1440        @$(APPEND) $(PATH_TARGET)/Doxyfile.iprt.dep "DOXYGEN_OUTPUT_PREV = $(IPRT_DOXYFILE_OUTPUT)" 
     1441        @$(APPEND) $(PATH_TARGET)/Doxyfile.iprt.dep "DOXYGEN_INPUT_PREV = $(IPRT_DOXYFILE_INPUT)" 
    14401442 
    14411443# Create the output directory. 
    1442 $(call DIRDEP, $(DOXYGEN_OUTPUT)): 
     1444$(call DIRDEP, $(IPRT_DOXYFILE_OUTPUT)): 
    14431445        $(MKDIR) -p $@ 
    14441446 
    14451447# Do the actual job. 
    1446 $(PATH_TARGET)/docs.iprt: $(PATH_TARGET)/Doxyfile $(DOXYGEN_INPUT) | $(call DIRDEP, $(DOXYGEN_OUTPUT)) 
    1447         $(RM) -f $(wildcard $(DOXYGEN_OUTPUT)/html/*) $(PATH_TARGET)/docs.iprt 
    1448         doxygen $(PATH_TARGET)/Doxyfile 
     1448$(PATH_TARGET)/docs.iprt: $(PATH_TARGET)/Doxyfile.iprt $(IPRT_DOXYFILE_INPUT) | $(call DIRDEP, $(IPRT_DOXYFILE_OUTPUT)) 
     1449        $(RM) -f $(wildcard $(IPRT_DOXYFILE_OUTPUT)/html/*) $(PATH_TARGET)/docs.iprt 
     1450        doxygen $(PATH_TARGET)/Doxyfile.iprt 
    14491451        $(APPEND) $(PATH_TARGET)/docs.iprt 
    14501452 
     
    14531455 
    14541456test: 
    1455         @echo test-$(comp-vars DOXYGEN_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) 
    1456         @echo $(DOXYGEN_OUTPUT) 
     1457        @echo test-$(comp-vars IPRT_DOXYFILE_OUTPUT,DOXYGEN_OUTPUT_PREV,FORCE) 
     1458        @echo $(IPRT_DOXYFILE_OUTPUT) 
    14571459        @echo $(DOXYGEN_OUTPUT_PREV) 
    1458         @echo $(DOXYGEN_INPUT) 
    1459  
     1460        @echo $(IPRT_DOXYFILE_INPUT) 
     1461 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy