Changeset 170 for trunk/libjdkmidi/trunk

Timestamp:

10/30/06 20:38:55 (2 years ago)

Author:

jeffk@…

Message:

magic.mak and doxyfile synced across projects

Location:

trunk/libjdkmidi/trunk

Files:

• docs/Doxyfile (modified) (8 diffs)
• magic.mak (modified) (30 diffs)

trunk/libjdkmidi/trunk/docs/Doxyfile

@@ -5 +5 @@
 #---------------------------------------------------------------------------
 PROJECT_NAME           = $(PROJECT)
-PROJECT_NUMBER         = 1
+PROJECT_NUMBER         = $(PROJECT_VERSION)
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
@@ -17 +17 @@
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = $(TOP) 
-STRIP_FROM_INC_PATH    = $(TOP)/include
+STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
@@ -73 +73 @@
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = $(TOP)/src $(TOP)/include $(TOP)/tests $(TOP)/tools $(TOP)/examples
+INPUT                  = $(TOP)/src $(TOP)/include $(TOP)/tests $(TOP)/examples $(TOP)/tools $(TOP)/gui
 FILE_PATTERNS          = 
 RECURSIVE              = YES
@@ -80 +80 @@
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = $(TOP)/examples
-EXAMPLE_PATTERNS       = *.cpp
+EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = YES
 IMAGE_PATH             = 
@@ -101 +101 @@
 ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = MIDI
+IGNORE_PREFIX          = 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
@@ -108 +108 @@
 HTML_OUTPUT            = $(PROJECT)
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            =
+HTML_HEADER            = $(TOP)/docs/header.html
+HTML_FOOTER            = $(TOP)/docs/footer.html
 HTML_STYLESHEET        = $(TOP)/docs/style.css
 HTML_ALIGN_MEMBERS     = YES
@@ -197 +197 @@
 CLASS_DIAGRAMS         = YES
 HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO 
+HAVE_DOT               = YES
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
@@ -208 +208 @@
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = gif
 DOT_PATH               = 
 DOTFILE_DIRS           = 

trunk/libjdkmidi/trunk/magic.mak

@@ -62 +62 @@
 add_top_dir_prefix=$(strip $(wildcard $(foreach lib,$(1),$(PROJECT_TOP_DIR)/$(lib))))
 
+
+# subdirs_in_path is a function which takes 1 parameter:
+#  $(1) is a single directory
+# it expands to a list of all directories in $(1)
+
+subdirs_in_path=$(strip $(foreach d,$(wildcard $(1)/*/.),$(dir $(d))))
+
+bare_subdirs_in_path=$(subst /,,$(subst $(1),,$(call subdirs_in_path,$(1))))
+
 # suffix_platform_dirs is a function that takes 3 parameters:
 #  $(1) is a subdirectory name, like 'src'
@@ -69 +78 @@
 # suffix_platform_dirs expands all existing directories that match any of $(3)/$(1) or $(3)/$(1)/$(2)
 
+
 suffix_platform_dirs=$(strip $(foreach dir,$(addsuffix /$(1),$(3)) $(foreach platform,$(2),$(addsuffix /$(1)/$(platform),$(3))),$(wildcard $(dir))))
+
 
 # targe_suffix_platform_dirs is a function which takes one parameter:
@@ -113 +124 @@
 get_m_o_files=$(addprefix $(OUTPUT_OBJ_DIR)/,$(1:.m=.o))
 get_mm_o_files=$(addprefix $(OUTPUT_OBJ_DIR)/,$(1:.mm=.o))
+get_rc_o_files=$(addprefix $(OUTPUT_OBJ_DIR)/,$(1:.rc=.o))
 
 get_native_cpp_o_files=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(1:.cpp=.o))
@@ -119 +131 @@
 get_native_m_o_files=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(1:.m=.o))
 get_native_mm_o_files=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(1:.mm=.o))
+get_native_rc_o_files=$(addprefix $(NATIVE_OUTPUT_OBJ_DIR)/,$(1:.rc=.o))
 
 
@@ -223 +236 @@
 LIB_$(1)_M_FILES=$$(call get_file_list,$$(LIB_$(1)_DIR),m)
 LIB_$(1)_MM_FILES=$$(call get_file_list,$$(LIB_$(1)_DIR),mm)
+LIB_$(1)_RC_FILES=$$(call get_file_list,$$(LIB_$(1)_DIR),rc)
 LIB_$(1)_SH_FILES=$$(call get_file_list,$$(LIB_$(1)_DIR),sh)
 
@@ -229 +243 @@
    $$(call get_c_o_files,$$(LIB_$(1)_C_FILES)) \
    $$(call get_m_o_files,$$(LIB_$(1)_M_FILES)) \
-   $$(call get_mm_o_files,$$(LIB_$(1)_MM_FILES))
+   $$(call get_mm_o_files,$$(LIB_$(1)_MM_FILES)) \
+   $$(call get_rc_o_files,$$(LIB_$(1)_RC_FILES))
 
 LIB_$(1)_EXE_FILES=$$(addprefix $$(OUTPUT_$(1)_DIR)/,$$(notdir $$(LIB_$(1)_O_FILES:.o=$$(EXE))))
@@ -240 +255 @@
 NATIVE_LIB_$(1)_MM_FILES=$$(call get_file_list,$$(NATIVE_LIB_$(1)_DIR),mm)
 NATIVE_LIB_$(1)_SH_FILES=$$(call get_file_list,$$(NATIVE_LIB_$(1)_DIR),sh)
+NATIVE_LIB_$(1)_RC_FILES=$$(call get_file_list,$$(NATIVE_LIB_$(1)_DIR),rc)
 
 NATIVE_LIB_TOOLS_O_FILES=$$(call get_native_cpp_o_files,$$(NATIVE_LIB_$(1)_CPP_FILES)) \
@@ -245 +261 @@
    $$(call get_native_c_o_files,$$(NATIVE_LIB_$(1)_C_FILES)) \
    $$(call get_native_m_o_files,$$(NATIVE_LIB_$(1)_M_FILES)) \
-   $$(call get_native_mm_o_files,$$(NATIVE_LIB_$(1)_MM_FILES))
+   $$(call get_native_mm_o_files,$$(NATIVE_LIB_$(1)_MM_FILES)) \
+   $$(call get_native_rc_o_files,$$(NATIVE_LIB_$(1)_RC_FILES))
 
 NATIVE_LIB_$(1)_EXE_FILES=$$(addprefix $$(NATIVE_OUTPUT_$(1)_DIR)/,$$(notdir $$(NATIVE_LIB_$(1)_O_FILES:.o=$$(NATIVE_EXE))))
@@ -421 +438 @@
 LIB_DOCS_DIR+=$(call target_suffix_platform_dirs,docs)
 
+ALL_SOURCES_DIRS=$(strip $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_GUI_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR))
+
 # calculate our output directories for our target platform results
 OUTPUT_DIR=$(BUILD_DIR)/build
@@ -441 +460 @@
 
 ALL_OUTPUT_DIRS+=$(OUTPUT_LIB_DIR) $(OUTPUT_TOOLS_DIR) $(OUTPUT_TESTS_DIR) $(OUTPUT_DOCS_DIR) $(OUTPUT_EXAMPLES_DIR) $(OUTPUT_OBJ_DIR) $(OUTPUT_GUI_DIR)
-
 
 
@@ -532 +550 @@
 NATIVE_LIB_EXAMPLES_DIR+=$(call native_suffix_platform_dirs,examples)
 NATIVE_LIB_TOOLS_DIR+=$(call native_suffix_platform_dirs,tools)
-
+NATIVE_ALL_SOURCES_DIRS=$(strip $(NATIVE_LIB_SRC_DIR) $(NATIVE_LIB_TESTS_DIR) $(NATIVE_LIB_GUI_DIR) $(NATIVE_LIB_EXAMPLES_DIR) $(NATIVE_LIB_TOOLS_DIR))
 
 NATIVE_ALL_OUTPUT_DIRS+=$(NATIVE_OUTPUT_LIB_DIR) $(NATIVE_OUTPUT_TOOLS_DIR) $(NATIVE_OUTPUT_TESTS_DIR) $(NATIVE_OUTPUT_DOCS_DIR) $(NATIVE_OUTPUT_EXAMPLES_DIR) $(NATIVE_OUTPUT_OBJ_DIR) 
@@ -552 +570 @@
 vpath %.cc $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR) $(LIB_GUI_DIR)
 vpath %.c $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR) $(LIB_GUI_DIR)
+vpath %.rc $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR) $(LIB_GUI_DIR)
 
 # all h files in our include dirs
@@ -586 +605 @@
 
 %.o : %.cc
+
+%.o : %.rc
 
 %.o : %.c
@@ -608 +629 @@
 COMPILE.mm=$(CXX) $(MMFLAGS) -c
 COMPILE.m=$(CC) $(MFLAGS) -c
+COMPILE.rc=$(WINDRES) 
 
 LINK.cpp=$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
@@ -620 +642 @@
 NATIVE_COMPILE.mm=$(NATIVE_CXX) $(NATIVE_MMFLAGS) -c
 NATIVE_COMPILE.m=$(NATIVE_CC) $(NATIVE_MFLAGS) -c
+NATIVE_COMPILE.rc=$(NATIVE_WINDRES)
 
 NATIVE_LINK.cpp=$(NATIVE_CXX) $(NATIVE_CXXFLAGS) $(NATIVE_LDFLAGS) $(NATIVE_LDLIBS)
@@ -658 +681 @@
    @$(CC) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
+# For RC (windows):
+$(OUTPUT_OBJ_DIR)/%.o : %.rc
+   @echo "WINDRES     : $(notdir $<)"
+   @$(COMPILE.rc) -I$(dir $<) $(PREPROCESS_FLAGS) $< $@
+
+
 
 
@@ -681 +710 @@
    @echo "NATIVE_CC     : $(notdir $<)"
    @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT -MF  '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.d $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.c)  $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+
+$(NATIVE_OUTPUT_OBJ_DIR)/%.o : %.rc
+   @echo "NATIVE_WINDRES     : $(notdir $<)"
+   @$(NATIVE_COMPILE.rc) -I$(dir $<) $(NATIVE_PREPROCESS_FLAGS) $< $@
 endif
 
@@ -726 +759 @@
 LIB_M_FILES=$(call get_src_file_list,m)
 LIB_MM_FILES=$(call get_src_file_list,mm)
+LIB_RC_FILES=$(call get_src_file_list,rc)
 LIB_O_FILES=$(call get_cpp_o_files,$(LIB_CPP_FILES)) \
    $(call get_cc_o_files,$(LIB_CC_FILES))  \
    $(call get_c_o_files,$(LIB_C_FILES)) \
    $(call get_m_o_files,$(LIB_M_FILES)) \
-   $(call get_mm_o_files,$(LIB_MM_FILES)) 
+   $(call get_mm_o_files,$(LIB_MM_FILES)) \
+   $(call get_rc_o_files,$(LIB_RC_FILES)) 
 
 
@@ -739 +774 @@
 NATIVE_LIB_M_FILES=$(call get_native_src_file_list,m)
 NATIVE_LIB_MM_FILES=$(call get_native_src_file_list,mm)
+NATIVE_LIB_RC_FILES=$(call get_native_src_file_list,rc)
 
 NATIVE_LIB_O_FILES=$(call get_native_cpp_o_files,$(NATIVE_LIB_CPP_FILES)) \
@@ -744 +780 @@
    $(call get_native_c_o_files,$(NATIVE_LIB_C_FILES)) \
    $(call get_native_m_o_files,$(NATIVE_LIB_M_FILES)) \
-   $(call get_native_mm_o_files,$(NATIVE_LIB_MM_FILES)) 
+   $(call get_native_mm_o_files,$(NATIVE_LIB_MM_FILES)) \
+   $(call get_native_rc_o_files,$(NATIVE_LIB_RC_FILES)) 
 endif
 
@@ -820 +857 @@
 
 ifeq ($(CROSS_COMPILING),1)
-everything : native_dirs dirs
+everything : native-dirs dirs
    @$(MAKE) all
 else
@@ -827 +864 @@
 endif
 
+
+# load in any custom makefiles in every source directory
+#-include $(wildcard $(foreach dir,$(ALL_SOURCES_DIRS),$(dir)/*.mak))
+
+
+# win32_gui_program is a bit of a hack but it shows the future plan of allowing multi object programs being built.
+# a program is defined my a dirname in gui/win32 - this dirname is the application name. Any sources in the dir are
+# compiled and linked with the library
+
+define win32_gui_program
+
+vpath %.cpp $(PROJECT_TOP_DIR)/gui/win32/$(1)/
+vpath %.cc $(PROJECT_TOP_DIR)/gui/win32/$(1)/
+vpath %.c $(PROJECT_TOP_DIR)/gui/win32/$(1)/
+vpath %.rc $(PROJECT_TOP_DIR)/gui/win32/$(1)/
+
+LIB_GUI_EXE_FILES += $$(OUTPUT_GUI_DIR)/$(1)$$(EXE)
+
+WIN32_GUI_DIR_$(1)=$$(PROJECT_TOP_DIR)/gui/win32/$(1)
+
+#LIB_GUI_DIR += $$(WIN32_GUI_DIR_$(1))
+
+WIN32_GUI_CPP_$(1)= $$(notdir $$(wildcard $$(PROJECT_TOP_DIR)/gui/win32/$(1)/*.cpp))
+WIN32_GUI_CC_$(1)= $$(notdir $$(wildcard $$(PROJECT_TOP_DIR)/gui/win32/$(1)/*.cc))
+WIN32_GUI_C_$(1)= $$(notdir $$(wildcard $$(PROJECT_TOP_DIR)/gui/win32/$(1)/*.c))
+WIN32_GUI_RC_$(1)= $$(notdir $$(wildcard $$(PROJECT_TOP_DIR)/gui/win32/$(1)/*.rc))
+
+WIN32_GUI_O_$(1)= $$(strip $$(WIN32_GUI_CPP_$(1):.cpp=.o) $$(WIN32_GUI_CC_$(1):.cc=.o) $$(WIN32_GUI_C_$(1):.c=.o) $$(WIN32_GUI_RC_$(1):.rc=.o))
+
+gui : $$(OUTPUT_GUI_DIR)/$(1)$$(EXE) 
+
+$$(OUTPUT_GUI_DIR)/$(1)$$(EXE) : $$(addprefix $$(OUTPUT_OBJ_DIR)/, $$(WIN32_GUI_O_$(1)))
+   @echo "LINKING MULTI-OBJECT GUI: $$(notdir $$@) from $$(notdir $$^)"
+   @$$(LINK.cpp) $$(LINK_FLAGS) $$(LDFLAGS) $$(LINK_FLAGS_GUI) -o $$@ $$^ -L$$(OUTPUT_LIB_DIR) $$(PROJECT_LDLIB) $$(LDLIBS) $$(LDLIBS_GUI)
+
+
+endef
+
+ifeq ($(TARGET_PLATFORM_MINGW32),1)
+$(foreach prog,$(call bare_subdirs_in_path,$(PROJECT_TOP_DIR)/gui/win32),$(eval $(call win32_gui_program,$(prog))))
+endif
 
 
@@ -885 +963 @@
 $(LIB_TESTS_EXE_FILES) : $(OUTPUT_LIB)
 
+.PHONY : gui
 
 gui: lib $(LIB_GUI_EXE_FILES)
@@ -939 +1018 @@
 
 clean :
-   -$(RM) $(LIB_TESTS_O_FILES) $(LIB_EXAMPLES_O_FILES) $(LIB_TOOLS_O_FILES) $(LIB_O_FILES) $(OUTPUT_OBJ_DIR)/*.d
-   -$(RM) $(LIB_TESTS_EXE_FILES) $(LIB_EXAMPLES_EXE_FILES) $(LIB_TOOLS_EXE_FILES)
-ifeq ($(CROSS_COMPILING),1)
-   -$(RM) $(NATIVE_LIB_TESTS_O_FILES) $(NATIVE_LIB_EXAMPLES_O_FILES) $(NATIVE_LIB_TOOLS_O_FILES) $(NATIVE_LIB_O_FILES) $(NATIVE_OUTPUT_OBJ_DIR)/*.d
-   -$(RM) $(NATIVE_LIB_TESTS_EXE_FILES) $(NATIVE_LIB_EXAMPLES_EXE_FILES) $(NATIVE_LIB_TOOLS_EXE_FILES)
+   -@$(RM) $(LIB_TESTS_O_FILES) $(LIB_EXAMPLES_O_FILES) $(LIB_TOOLS_O_FILES) $(LIB_O_FILES) $(OUTPUT_OBJ_DIR)/*.d 2>/dev/null
+   -@$(RM) $(LIB_TESTS_EXE_FILES) $(LIB_EXAMPLES_EXE_FILES) $(LIB_TOOLS_EXE_FILES) 2>/dev/null
+   -@$(RM) -r -f $(LIB_GUI_EXE_FILES) 2>/dev/null
+ifeq ($(CROSS_COMPILING),1)
+   -@$(RM) $(NATIVE_LIB_TESTS_O_FILES) $(NATIVE_LIB_EXAMPLES_O_FILES) $(NATIVE_LIB_TOOLS_O_FILES) $(NATIVE_LIB_O_FILES) $(NATIVE_OUTPUT_OBJ_DIR)/*.d 2>/dev/null
+   -@$(RM) $(NATIVE_LIB_TESTS_EXE_FILES) $(NATIVE_LIB_EXAMPLES_EXE_FILES) $(NATIVE_LIB_TOOLS_EXE_FILES) 2>/dev/null
 endif
 
@@ -953 +1033 @@
 
 distclean : clean
-   -$(RM) $(OUTPUT_LIB)
-ifeq ($(CROSS_COMPILING),1)
-   -$(RM) $(NATIVE_OUTPUT_LIB)
-endif
-
-
-ifeq ($(CROSS_COMPILING),1)
-.PHONY : native_dirs
+   -@$(RM) $(OUTPUT_LIB) 2>/dev/null
+ifeq ($(CROSS_COMPILING),1)
+   -@$(RM) $(NATIVE_OUTPUT_LIB) 2>/dev/null
+endif
+
+
+ifeq ($(CROSS_COMPILING),1)
+.PHONY : native-dirs
 
 native-dirs :
@@ -984 +1064 @@
 endif
 
-.PHONY : native_tools
+.PHONY : native-tools
 
 native-tools : native-lib $(NATIVE_LIB_TOOLS_EXE_FILES)
@@ -1052 +1132 @@
    @echo "OUTPUT_LIB: $(OUTPUT_LIB)"   
    @echo "LIB_DIRS: $(LIB_DIRS)"
+   @echo "PLATFORM_DIRS: $(PLATFORM_DIRS)"
    @echo "LIB_INCLUDE_DIR: $(LIB_INCLUDE_DIR)"
    @echo "LIB_SRC_DIR: $(LIB_SRC_DIR)"
@@ -1063 +1144 @@
    @echo "LIB_MM_FILES: $(LIB_MM_FILES)"
    @echo "LIB_M_FILES: $(LIB_M_FILES)"
+   @echo "LIB_RC_FILES: $(LIB_RC_FILES)"
    @echo "LIB_O_FILES: $(notdir $(LIB_O_FILES))"
    @echo "LIB_TOOLS_EXE_FILES: $(notdir $(LIB_TOOLS_EXE_FILES))"
@@ -1089 +1171 @@
    @echo "NATIVE_LIB_SRC_DIR: $(NATIVE_LIB_SRC_DIR)"
    @echo "NATIVE_LIB_TOOLS_DIR: $(NATIVE_LIB_TOOLS_DIR)"
+   @echo "NATIVE_PLATFORM_DIRS: $(NATIVE_PLATFORM_DIRS)"
 endif
 
@@ -1131 +1214 @@
 
 
+
+