Changeset 132 in libcf


Ignore:
Timestamp:
07/11/13 09:25:31 (11 years ago)
Author:
cheese
Message:

#1 fix condition for doxygen making

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/makeinclude/platform.mk

    r119 r132  
    88UNAME_A := $(shell uname -a)
    99DOXYGEN := $(shell which doxygen)
     10
     11DOXYGEN_OUTPUT_PATH = ../documentation
     12DOXYGEN_PATH        = ../docs
     13DOXYGEN_FILE        = $(DOXYGEN_PATH)/doxyfile
    1014
    1115#------------------------------------------------------------

  • trunk/src/makefile

    r128 r132  
    33#----------------------------------------------------------
    44include ../makeinclude/userdefine.mk
    5 include ../makeinclude/platform.mk
     5include ../makeinclude/common.mk
    66
    77#----------------------------------------------------------
    … …  
    2929SRCS            = $(addsuffix .$(SOURCE_TYPE),$(FILES))
    3030OBJS            = $(addprefix $(OBJ_PATH)/,$(addsuffix .o,$(FILES)))
    31 DOXYGEN_PATH    = ../docs
    32 DOXYGEN_FILE    = $(DOXYGEN_PATH)/doxyfile
    3331
    3432INCLUDES        = -I../include
    … …  
    3735# label
    3836#----------------------------------------------------------
    39 all: $(OBJ_PATH) $(TARGET_PATH) $(TARGET) doxygen
     37all: $(OBJ_PATH) $(TARGET_PATH) $(TARGET) $(DOXYGEN_OUTPUT_PATH)
    4038    @echo ========== Complete LIBCF compilation ==========
    41 $(TARGET_PATH): dummy
     39$(TARGET_PATH):
     40    @echo make target path
    4241    @if [ ! -d $@ ] ; then mkdir $@ ; fi
    43 $(OBJ_PATH): dummy
     42$(OBJ_PATH):
     43    @echo make obj path
    4444    @if [ ! -d $@ ] ; then mkdir $@ ; fi
    4545
    … …  
    5656
    5757# doxygen
    58 doxygen: dummy
     58$(DOXYGEN_OUTPUT_PATH):
    5959ifeq ($(DOXYGEN_CREATE),YES)
    6060ifeq ($(DOXYGEN),)
    … …  
    6262else
    6363    @echo "========== DOXYGEN DOCUMENTATION =========="
     64    @if [ ! -d $@ ] ; then mkdir $@ ; fi
    6465    cd $(DOXYGEN_PATH); $(DOXYGEN) $(DOXYGEN_FILE); cat warning.log;
    6566endif
    6667endif
    6768
    68 clean: dummy
     69clean:
    6970    rm -rf $(TARGET_PATH) $(OBJ_PATH)
    7071ifeq ($(DOXYGEN_CREATE),YES)
    71     rm -rf ../documentation
     72    rm -rf $(DOXYGEN_OUTPUT_PATH)
    7273endif
    73 
    74 dummy:

  • trunk/test/makefile

    r106 r132  
    33#----------------------------------------------------------
    44include ../makeinclude/userdefine.mk
    5 include ../makeinclude/platform.mk
     5include ../makeinclude/common.mk
    66
    77#----------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.