Changeset 100 for trunk/libjdkmidi/trunk

Timestamp:

09/07/06 16:46:53 (2 years ago)

Author:

jeffk@…

Message:

oops, magic.mak caused make to crash, reverting last change for now

Files:

• trunk/libjdkmidi/trunk/magic.mak (modified) (14 diffs)

trunk/libjdkmidi/trunk/magic.mak

@@ -11 +11 @@
 
 
-# this first target, 'everything' is a placeholder which makes the required subdirectories and then
-# calls make again with the required directories made. Since these subdirectories are part of the
-# search paths, make must see them when invoked otherwise it gets confused.
-
-.PHONY : everything
-
-ifeq ($(CROSS_COMPILING),1)
-everything : native_dirs dirs
-   @$(MAKE) all
-else
-everything : dirs
-   @$(MAKE) all
-endif
-
-
 # default project settings. These are usually originally set in project.mak
 
@@ -228 +213 @@
 # all source files in a specified directory class and construct the o file lists for them.
 # Param $(1) is the class of program in capitals, for example TOOLS, TESTS, EXAMPLES, GUI
-# Param $(2) is the lowercase directory name that these source files live in. $(2) is also
-# used as the make target for the exe files in this class.
 # the text returned by this function is then to be eval'd.  The appropriate lists of 
 # source files and O files for this class are then created dynamically.
 
 define search_program_group
-LIB_$(1)_DIR+=$$(call target_suffix_platform_dirs,$(2))
-
-
 LIB_$(1)_CPP_FILES=$$(call get_file_list,$$(LIB_$(1)_DIR),cpp)
 LIB_$(1)_CC_FILES=$$(call get_file_list,$$(LIB_$(1)_DIR),cc)
@@ -251 +231 @@
 LIB_$(1)_EXE_FILES=$$(addprefix $$(OUTPUT_$(1)_DIR)/,$$(notdir $$(LIB_$(1)_O_FILES:.o=$$(EXE))))
 
-OUTPUT_$(1)_DIR?=$$(OUTPUT_DIR)/$(2)
-
-ALL_OUTPUT_DIRS+=$$(OUTPUT_DIR)/$(2)
-
-.PHONY : $(2)
-
-$(2) : lib $$(LIB_$(1)_EXE_FILES) config-tool
-
-$$(LIB_$(1)_EXE_FILES) : $$(OUTPUT_LIB)
-
-ifeq ($(CROSS_COMPILING),1)
-
-NATIVE_LIB_$(1)_DIR+=$$(call native_suffix_platform_dirs,$(2))
-
+ifeq ($(CROSS_COMPILING),1)
 NATIVE_LIB_$(1)_CPP_FILES=$$(call get_file_list,$$(NATIVE_LIB_$(1)_DIR),cpp)
 NATIVE_LIB_$(1)_CC_FILES=$$(call get_file_list,$$(NATIVE_LIB_$(1)_DIR),cc)
@@ -271 +238 @@
 NATIVE_LIB_$(1)_SH_FILES=$$(call get_file_list,$$(NATIVE_LIB_$(1)_DIR),sh)
 
-NATIVE_LIB_$(1)_O_FILES=$$(call get_native_cpp_o_files,$$(NATIVE_LIB_$(1)_CPP_FILES)) \
+NATIVE_LIB_TOOLS_O_FILES=$$(call get_native_cpp_o_files,$$(NATIVE_LIB_$(1)_CPP_FILES)) \
    $$(call get_native_cc_o_files,$$(NATIVE_LIB_$(1)_CC_FILES)) \
    $$(call get_native_c_o_files,$$(NATIVE_LIB_$(1)_C_FILES)) \
@@ -278 +245 @@
 
 NATIVE_LIB_$(1)_EXE_FILES=$$(addprefix $$(NATIVE_OUTPUT_$(1)_DIR)/,$$(notdir $$(NATIVE_LIB_$(1)_O_FILES:.o=$$(NATIVE_EXE))))
-
-NATIVE_OUTPUT_$(1)_DIR?=$$(NATIVE_OUTPUT_DIR)/$(2)
-
-NATIVE_ALL_OUTPUT_DIRS+=$$(NATIVE_OUTPUT_DIR)/$(2)
-
-.PHONY : native_$(1)
-
-native-$(2) : native-lib $$(NATIVE_LIB_$(1)_EXE_FILES)
-
-$$(NATIVE_LIB_$(1)_EXE_FILES) : $(NATIVE_OUTPUT_LIB)
-endif
-
-
+endif
 endef
 
@@ -457 +412 @@
 LIB_INCLUDE_DIR+=$(call target_suffix_platform_dirs,include)
 LIB_SRC_DIR+=$(call target_suffix_platform_dirs,src)
+LIB_TESTS_DIR+=$(call target_suffix_platform_dirs,tests)
+LIB_GUI_DIR+=$(call target_suffix_platform_dirs,gui)
+LIB_EXAMPLES_DIR+=$(call target_suffix_platform_dirs,examples)
+LIB_TOOLS_DIR+=$(call target_suffix_platform_dirs,tools)
 LIB_DOCS_DIR+=$(call target_suffix_platform_dirs,docs)
 
@@ -462 +421 @@
 OUTPUT_DIR=$(BUILD_DIR)/build
 OUTPUT_LIB_DIR?=$(OUTPUT_DIR)/lib
+OUTPUT_TESTS_DIR?=$(OUTPUT_DIR)/tests
 OUTPUT_DOCS_DIR?=$(OUTPUT_DIR)/docs
+OUTPUT_TOOLS_DIR?=$(OUTPUT_DIR)/tools
+OUTPUT_GUI_DIR?=$(OUTPUT_DIR)/gui
+OUTPUT_EXAMPLES_DIR?=$(OUTPUT_DIR)/examples
 OUTPUT_OBJ_DIR?=$(OUTPUT_DIR)/obj
 
@@ -476 +439 @@
 INSTALL_DOCS_DIR?=$(INSTALL_DIR)/share/$(PROJECT)-$(PROJECT_VERSION)
 
-ALL_OUTPUT_DIRS+=$(OUTPUT_LIB_DIR) $(OUTPUT_DOCS_DIR) $OUTPUT_OBJ_DIR)
+ALL_OUTPUT_DIRS+=$(OUTPUT_LIB_DIR) $(OUTPUT_TOOLS_DIR) $(OUTPUT_TESTS_DIR) $(OUTPUT_DOCS_DIR) $(OUTPUT_EXAMPLES_DIR) $(OUTPUT_OBJ_DIR) $(OUTPUT_GUI_DIR)
+
+
 
 NATIVE_USE_AR?=1
@@ -551 +516 @@
 # calculate our output directories for our native platform results
 
-NATIVE_LIB_SRC_DIR+=$(call native_suffix_platform_dirs,src)
-
 NATIVE_OUTPUT_DIR=$(NATIVE_BUILD_DIR)/native
 NATIVE_OUTPUT_LIB_DIR?=$(NATIVE_OUTPUT_DIR)/lib
+NATIVE_OUTPUT_TESTS_DIR?=$(NATIVE_OUTPUT_DIR)/tests
 NATIVE_OUTPUT_DOCS_DIR?=$(NATIVE_OUTPUT_DIR)/docs
+NATIVE_OUTPUT_TOOLS_DIR?=$(NATIVE_OUTPUT_DIR)/tools
+NATIVE_OUTPUT_EXAMPLES_DIR?=$(NATIVE_OUTPUT_DIR)/examples
 NATIVE_OUTPUT_OBJ_DIR?=$(NATIVE_OUTPUT_DIR)/obj
 
 NATIVE_OUTPUT_LIB?=$(NATIVE_OUTPUT_LIB_DIR)/lib$(PROJECT).a
 
-NATIVE_ALL_OUTPUT_DIRS+=$(NATIVE_OUTPUT_LIB_DIR) $(NATIVE_OUTPUT_DOCS_DIR) $(NATIVE_OUTPUT_OBJ_DIR) 
+
+NATIVE_LIB_SRC_DIR+=$(call native_suffix_platform_dirs,tests)
+NATIVE_LIB_TESTS_DIR+=$(call native_suffix_platform_dirs,tests)
+NATIVE_LIB_GUI_DIR+=$(call native_suffix_platform_dirs,gui)
+NATIVE_LIB_EXAMPLES_DIR+=$(call native_suffix_platform_dirs,examples)
+NATIVE_LIB_TOOLS_DIR+=$(call native_suffix_platform_dirs,tools)
+
+
+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) 
 
 
@@ -572 +546 @@
 vpath %.o $(OUTPUT_OBJ_DIR)
 
-# all source files in all of our src,tests,examples,tools,gui dirs
+# all source files in all of our src,tests,ecxamples,tools,gui dirs
 vpath %.m $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR) $(LIB_GUI_DIR)
 vpath %.mm $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR) $(LIB_GUI_DIR)
@@ -778 +752 @@
 # get the list of tool program source files from the tools directories
 
-$(eval $(call search_program_group,TOOLS,tools))
+$(eval $(call search_program_group,TOOLS))
 
 # get the list of test program source files from the tests directories
 
-$(eval $(call search_program_group,TESTS,tests))
+$(eval $(call search_program_group,TESTS))
 
 # get the list of example program source files from the examples directories
 
-$(eval $(call search_program_group,EXAMPLES,examples))
+$(eval $(call search_program_group,EXAMPLES))
 
 # get the list of example program source files from the gui directories
 
-$(eval $(call search_program_group,GUI,gui))
+$(eval $(call search_program_group,GUI))
 
 
 
 # manipulate these file lists to create our desired output files in the proper place
+
+# this first target, 'everything' is a placeholder which makes the required subdirectories and then
+# calls make again with the required directories made. Since these subdirectories are part of the
+# search paths, make must see them when invoked otherwise it gets confused.
+
+.PHONY : everything
+
+ifeq ($(CROSS_COMPILING),1)
+everything : native_dirs dirs
+   @$(MAKE) all
+else
+everything : dirs
+   @$(MAKE) all
+endif
+
 
 
@@ -828 +817 @@
 endif
 
+
+
+.PHONY : tools
+
+tools : lib $(LIB_TOOLS_EXE_FILES) config-tool
+
+$(LIB_TOOLS_EXE_FILES) : $(OUTPUT_LIB)
+
+.PHONY : examples
+
+examples: lib $(LIB_EXAMPLES_EXE_FILES)
+
+$(LIB_EXAMPLES_EXE_FILES) : $(OUTPUT_LIB)
+
+.PHONY : tests
+
+tests: lib $(LIB_TESTS_EXE_FILES)
+
+$(LIB_TESTS_EXE_FILES) : $(OUTPUT_LIB)
+
+
+gui: lib $(LIB_GUI_EXE_FILES)
+
+$(LIB_GUI_EXE_FILES) : $(OUTPUT_LIB)
 
 .PHONY : install
@@ -921 +934 @@
 
 
+.PHONY : native_tools
+
+native-tools : native-lib $(NATIVE_LIB_TOOLS_EXE_FILES)
+
+$(NATIVE_LIB_TOOLS_EXE_FILES) : $(NATIVE_OUTPUT_LIB)
+
+.PHONY : native-examples
+
+native-examples: native-lib $(NATIVE_LIB_EXAMPLES_EXE_FILES)
+
+$(NATIVE_LIB_EXAMPLES_EXE_FILES) : $(NATIVE_OUTPUT_LIB)
+
+.PHONY : native-tests
+
+native-tests: native-lib $(NATIVE_LIB_TESTS_EXE_FILES)
+
+$(NATIVE_LIB_TESTS_EXE_FILES) : $(NATIVE_OUTPUT_LIB)
 
 .PHONY : native-test
@@ -968 +998 @@
    @echo "RANLIB : $(RANLIB)"
    @echo "COMPILE_FLAGS: $(COMPILE_FLAGS)"
-   @echo "DEFINES: $(DEFINES)"
    @echo "LINK_FLAGS: $(LINK_FLAGS)"
    @echo "LDLIBS: $(LDLIBS)"