Changeset 97 for trunk/libjdkmidi/trunk

Timestamp:

09/01/06 15:21:45 (2 years ago)

Author:

jeffk@…

Message:

magic.mak updated to include gui programs with separate compiling/link flags and platform support. TOP_LIB_DIRS variable allows you to specify multiple directories that each have include and src dirs so you can merge multiple libraries into one makefile.

Location:

trunk/libjdkmidi/trunk

Files:

• magic.mak (modified) (28 diffs)
• project.mak (modified) (1 diff)

trunk/libjdkmidi/trunk/magic.mak

@@ -13 +13 @@
 
 LIBS+=
-LIB_DIRS+=
-LIB_SRC_DIR=$(LIB_DIRS)
+LIB_DIRS+=$(foreach lib,$(TOP_LIB_DIRS),$(PROJECT_TOP_DIR)/$(lib))
+LIB_SRC_DIR+=$(TOP_LIB_DIRS)
 
 RSYNC?=rsync
@@ -36 +36 @@
 EXE=.exe
 PLATFORM_DIRS+=win32 mingw32
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_MINGW32)
+LDLIBS_GUI+=$(LDLIBS_GUI_MINGW32)
 LDLIBS+=$(LDLIBS_MINGW32)
 DEFINES+=$(DEFINES_MINGW32)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_MINGW32)
 LINK_FLAGS+=$(LINK_FLAGS_MINGW32)
+LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_MINGW32) $(TOP_LIB_DIRS_WIN32),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -47 +50 @@
 EXE=.exe
 PLATFORM_DIRS+=posix cygwin
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_CYGWIN)
+LDLIBS_GUI+=$(LDLIBS_GUI_CYGWIN)
 LDLIBS+=$(LDLIBS_CYGWIN)
 DEFINES+=$(DEFINES_CYGWIN) $(DEFINES_POSIX)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_CYGWIN)
 LINK_FLAGS+=$(LINK_FLAGS_CYGWIN) $(LINK_FLAGS_POSIX)
+LIB_SRC_DIR+=$(foreach lib, $(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_CYGWIN),$(TOP_PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -57 +63 @@
 TARGET_PLATFORM_GENERIC=0
 PLATFORM_DIRS+=posix
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_POSIX)
+LDLIBS_GUI+=$(LDLIBS_GUI_POSIX)
 LDLIBS+=$(LDLIBS_POSIX)
 DEFINES+=$(DEFINES_POSIX)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_POSIX)
 LINK_FLAGS+=$(LINK_FLAGS_POSIX)
+LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX),$(TOP_PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -67 +76 @@
 TARGET_PLATFORM_GENERIC=0
 PLATFORM_DIRS+=posix linux
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_LINUX)
+LDLIBS_GUI+=$(LDLIBS_GUI_LINUX)
 LDLIBS+=$(LDLIBS_LINUX)
 DEFINES+=$(DEFINES_LINUX) $(DEFINES_POSIX)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_LINUX) $(COMPILE_FLAGS_POSIX)
 LINK_FLAGS+=$(LINK_FLAGS_LINUX) $(LINK_FLAGS_POSIX)
+LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_LINUX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -82 +94 @@
 MACOSX_LIBTOOL=libtool
 MACOSX_LIBTOOLFLAGS?=-static
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_MACOSX)
+LDLIBS_GUI+=$(LDLIBS_GUI_MACOSX)
 LDLIBS+=$(LDLIBS_MACOSX_PPC) $(LDLIBS_MACOSX)
 DEFINES+=$(DEFINES_MACOSX_PPC) $(DEFINES_POSIX) $(DEFINES_MACOSX)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_MACOSX_PPC) $(COMPILE_FLAGS_POSIX) $(COMPILE_FLAGS_MACOSX)
 LINK_FLAGS+=$(LINK_FLAGS_MACOSX_PPC) $(LINK_FLAGS_POSIX) $(LINK_FLAGS_MACOSX)
+LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_MACOSX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -97 +112 @@
 MACOSX_LIBTOOL=libtool
 MACOSX_LIBTOOLFLAGS?=-static
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_MACOSX)
+LDLIBS_GUI+=$(LDLIBS_GUI_MACOSX)
 LDLIBS+=$(LDLIBS_MACOSX_I386) $(LDLIBS_MACOSX)
 DEFINES+=$(DEFINES_MACOSX_I386) $(DEFINES_POSIX) $(DEFINES_MACOSX)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_MACOSX_I386) $(COMPILE_FLAGS_POSIX) $(COMPILE_FLAGS_MACOSX)
 LINK_FLAGS+=$(LINK_FLAGS_MACOSX_I386) $(LINK_FLAGS_POSIX) $(LINK_FLAGS_MACOSX)
+LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_MACOSX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -117 +135 @@
 MACOSX_LIBTOOL=libtool
 MACOSX_LIBTOOLFLAGS?=-static
+LINK_FLAGS_GUI+=$(LINK_FLAGS_GUI_MACOSX)
+LDLIBS_GUI+=$(LDLIBS_GUI_MACOSX)
 LDLIBS+=$(LDLIBS_MACOSX_UNIVERSAL) $(LDLIBS_MACOSX)
 DEFINES+=$(DEFINES_MACOSX_UNIVERSAL) $(DEFINES_POSIX) $(DEFINES_MACOSX)
 COMPILE_FLAGS+=$(COMPILE_FLAGS_MACOSX_UNIVERSAL) $(COMPILE_FLAGS_POSIX) $(COMPILE_FLAGS_MACOSX)
 LINK_FLAGS+=$(LINK_FLAGS_MACOSX_UNIVERSAL) $(LINK_FLAGS_POSIX) $(LINK_FLAGS_MACOSX)
+LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_MACOSX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -156 +177 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_MINGW32)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_MINGW32)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_MINGW32) $(TOP_LIB_DIRS_WIN32),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -167 +189 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_CYGWIN) $(COMPILE_FLAGS_POSIX)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_CYGWIN) $(LINK_FLAGS_POSIX)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_CYGWIN),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -177 +200 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_POSIX)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_POSIX)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -187 +211 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_LINUX) $(COMPILE_FLAGS_POSIX)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_LINUX) $(LINK_FLAGS_POSIX)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_LINUX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -202 +227 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_MACOSX_PPC) $(COMPILE_FLAGS_POSIX) $(COMPILE_FLAGS_MACOSX)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_MACOSX_PPC) $(LINK_FLAGS_POSIX)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_MACOSX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -217 +243 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_MACOSX_I386) $(COMPILE_FLAGS_POSIX) $(COMPILE_FLAGS_MACOSX)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_MACOSX_I386) $(LINK_FLAGS_POSIX)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_MACOSX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -236 +263 @@
 NATIVE_COMPILE_FLAGS+=$(COMPILE_FLAGS_MACOSX_UNIVERSAL) $(COMPILE_FLAGS_POSIX) $(COMPILE_FLAGS_MACOSX)
 NATIVE_LINK_FLAGS+=$(LINK_FLAGS_MACOSX_UNIVERSAL) $(LINK_FLAGS_POSIX)
+NATIVE_LIB_SRC_DIR+=$(foreach lib,$(TOP_LIB_DIRS_POSIX) $(TOP_LIB_DIRS_MACOSX),$(PROJECT_TOP_DIR)/$(lib))
 endif
 
@@ -250 +278 @@
 
 
-NATIVE_LIB_SRC_DIR+=$(addsuffix /src,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /src/$(platform),$(LIB_DIRS)))
-NATIVE_LIB_TESTS_DIR+=$(addsuffix /tests,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /tests/$(platform),$(LIB_DIRS)))
-NATIVE_LIB_EXAMPLES_DIR+=$(addsuffix /examples,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /examples/$(platform),$(LIB_DIRS)))
-NATIVE_LIB_TOOLS_DIR+=$(addsuffix /tools,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /tools/$(platform),$(LIB_DIRS)))
-
-
-endif
-
-LIB_INCLUDE_DIR+=$(addsuffix /include,$(LIB_DIRS))
-LIB_SRC_DIR+=$(addsuffix /src,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /src/$(platform),$(LIB_DIRS)))
-LIB_TESTS_DIR+=$(addsuffix /tests,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /tests/$(platform),$(LIB_DIRS)))
-LIB_EXAMPLES_DIR+=$(addsuffix /examples,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /examples/$(platform),$(LIB_DIRS)))
-LIB_TOOLS_DIR+=$(addsuffix /tools,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /tools/$(platform),$(LIB_DIRS)))
-LIB_DOCS_DIR+=$(addsuffix /docs,$(LIB_DIRS))
+NATIVE_LIB_SRC_DIR+=$(foreach dir,$(addsuffix /src,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /src/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+NATIVE_LIB_GUI_DIR+=$(foreach dir,$(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /gui/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+NATIVE_LIB_TESTS_DIR+=$(foreach dir,$(addsuffix /tests,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /tests/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+NATIVE_LIB_EXAMPLES_DIR+=$(foreach dir,$(addsuffix /examples,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /examples/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+NATIVE_LIB_TOOLS_DIR+=$(foreach dir,$(addsuffix /tools,$(LIB_DIRS)) $(foreach platform,$(NATIVE_PLATFORM_DIRS),$(addsuffix /tools/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+
+
+endif
+
+LIB_INCLUDE_DIR+=$(foreach dir,$(addsuffix /include,$(LIB_DIRS)),$(wildcard $(dir)))
+LIB_SRC_DIR+=$(foreach dir,$(addsuffix /src,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /src/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+LIB_TESTS_DIR+=$(foreach dir,$(addsuffix /tests,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /tests/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+LIB_GUI_DIR+=$(foreach dir,$(foreach platform,$(PLATFORM_DIRS),$(addsuffix /gui/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+LIB_EXAMPLES_DIR+=$(foreach dir,$(addsuffix /examples,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /examples/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+LIB_TOOLS_DIR+=$(foreach dir,$(addsuffix /tools,$(LIB_DIRS)) $(foreach platform,$(PLATFORM_DIRS),$(addsuffix /tools/$(platform),$(LIB_DIRS))),$(wildcard $(dir)))
+LIB_DOCS_DIR+=$(foreach dir,$(addsuffix /docs,$(LIB_DIRS)),$(wildcard $(dir)))
 
 
@@ -272 +302 @@
 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
@@ -288 +319 @@
 endif
 
-ALL_OUTPUT_DIRS+=$(OUTPUT_LIB_DIR) $(OUTPUT_TOOLS_DIR) $(OUTPUT_TESTS_DIR) $(OUTPUT_DOCS_DIR) $(OUTPUT_EXAMPLES_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)
 
 
 # our paths
 vpath %.o $(OUTPUT_OBJ_DIR)
-vpath %.m $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR)
-vpath %.mm $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR)
-vpath %.cpp $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR)
-vpath %.c $(LIB_SRC_DIR) $(LIB_TESTS_DIR) $(LIB_EXAMPLES_DIR) $(LIB_TOOLS_DIR)
+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)
+vpath %.cpp $(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 %.h .:$(LIB_INCLUDE_DIR)
 vpath %.a $(OUTPUT_LIB_DIR)
@@ -333 +364 @@
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.mm
    @echo "CXX mm : $(notdir $<)"
-   @$(CXX) $(PREPROCESS_FLAGS) $(MMFLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< &&   @$(COMPILE.mm) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CXX) $(PREPROCESS_FLAGS) $(MMFLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< &&   $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $< 
 
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.m
    @echo "CC  m  : $(notdir $<)"
-   @$(CC) $(PREPROCESS_FLAGS)  $(MFLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && @$(COMPILE.m) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
+   @$(CC) $(PREPROCESS_FLAGS)  $(MFLAGS) -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.cpp
@@ -347 +378 @@
    @$(CC) $(PREPROCESS_FLAGS)  -MM -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
+
+
 ifeq ($(CROSS_COMPILING),1)
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.mm
    @echo "NATIVE_CXX mm : $(notdir $<)"
-   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && @$(NATIVE_COMPILE.mm) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.mm) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.m
    @echo "NATIVE_CC  m  : $(notdir $<)"
-   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && @$(NATIVE_COMPILE.m) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
+   @$(NATIVE_CC) $(NATIVE_PREPROCESS_FLAGS) -MM -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.m) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $<
 
 $(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.cpp
@@ -366 +399 @@
 endif
 
+
 $(OUTPUT_TOOLS_DIR)/%$(EXE) : $(OUTPUT_OBJ_DIR)/%.o
    @echo "LINKING tool: $(notdir $<)"
    @$(LINK.cpp) $(LINK_FLAGS) $(LDFLAGS) -o $(OUTPUT_TOOLS_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS)
+
+
+$(OUTPUT_GUI_DIR)/%$(EXE) : $(OUTPUT_OBJ_DIR)/%.o
+   @echo "LINKING gui: $(notdir $<)"
+   @$(LINK.cpp) $(LINK_FLAGS) $(LDFLAGS) $(LINK_FLAGS_GUI) -o $(OUTPUT_GUI_DIR)/$*$(EXE) $< -L$(OUTPUT_LIB_DIR) -l$(PROJECT) $(LDLIBS) $(LDLIBS_GUI)
+
 
 $(OUTPUT_EXAMPLES_DIR)/%$(EXE) : $(OUTPUT_OBJ_DIR)/%.o
@@ -513 +553 @@
 endif
 
+# get the list of tool program source files from the ../gui directory
+LIB_GUI_CPP_FILES=$(notdir $(foreach dir,$(LIB_GUI_DIR),$(wildcard $(dir)/*.cpp))) 
+LIB_GUI_C_FILES=$(notdir $(foreach dir,$(LIB_GUI_DIR),$(wildcard $(dir)/*.c))) 
+LIB_GUI_M_FILES=$(notdir $(foreach dir,$(LIB_GUI_DIR),$(wildcard $(dir)/*.m))) 
+LIB_GUI_MM_FILES=$(notdir $(foreach dir,$(LIB_GUI_DIR),$(wildcard $(dir)/*.mm))) 
+LIB_GUI_O_FILES=$(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_GUI_CPP_FILES:.cpp=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_GUI_C_FILES:.c=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_GUI_M_FILES:.m=.o)) $(addprefix $(OUTPUT_OBJ_DIR)/,$(LIB_GUI_MM_FILES:.mm=.o))
+LIB_GUI_EXE_FILES=$(addprefix $(OUTPUT_GUI_DIR)/,$(notdir $(LIB_GUI_O_FILES:.o=$(EXE))))
+
 
 # manipulate these file lists to create our desired output files in the proper place
@@ -531 +579 @@
 
 ifeq ($(CROSS_COMPILING),1)
-all : native-dirs dirs native-lib native-tools native-tests native-examples dirs lib tools tests examples 
+all : native-dirs dirs native-lib native-tools native-tests native-examples dirs lib tools tests examples gui
 else
-all : dirs lib tools tests examples 
+all : dirs lib tools tests examples gui
 endif
 
@@ -579 +627 @@
 $(LIB_TESTS_EXE_FILES) : $(OUTPUT_LIB)
 
+
+gui: lib $(LIB_GUI_EXE_FILES)
+
+$(LIB_GUI_EXE_FILES) : $(OUTPUT_LIB)
+
 .PHONY : install
 
 install : lib tools tests examples 
    @-$(MKDIR) -p $(INSTALL_BIN_DIR)
-   @for i in $(LIB_TOOLS_EXE_FILES); do echo "$${i}"; $(INSTALL) "$${i}" "$(INSTALL_BIN_DIR)"; done
+   @for i in $(LIB_TOOLS_EXE_FILES) $(LIB_GUI_EXE_FILES); do echo "$${i}"; $(INSTALL) "$${i}" "$(INSTALL_BIN_DIR)"; done
 
 .PHONY : install-dev
@@ -741 +794 @@
    @echo "LIB_TOOLS_DIR: $(LIB_TOOLS_DIR)"
    @echo "LIB_EXAMPLES_DIR: $(LIB_EXAMPLES_DIR)"
+   @echo "LIB_GUI_DIR: $(LIB_GUI_DIR)"
    @echo "LIB_CPP_FILES: $(LIB_CPP_FILES)"
    @echo "LIB_C_FILES: $(LIB_C_FILES)"
@@ -775 +829 @@
    @echo "lib : build library $(OUTPUT_LIB)"
    @echo "docs : build doxygen docs in $(PROJECT_TOP_DIR)/docs/html"
-   @echo "clean : clean intermediatte files"
+   @echo "clean : clean intermediate files"
    @echo "distclean / realclean : clean all built files (except docs)"
    @echo "tools : build tool programs $(LIB_TOOLS_EXE_FILES)"
@@ -792 +846 @@
 endif
 
+# read any custom mak files in the top dir of each library dir / project
+
+-include $(foreach dir,$(LIB_DIRS),$(dir)/$(dir).mak)
+
 # include any dependencies created during the last make.
 -include $(OUTPUT_OBJ_DIR)/*.d
@@ -800 +858 @@
 
 
-

trunk/libjdkmidi/trunk/project.mak

@@ -6 +6 @@
 PROJECT_LICENSE='GPL'
 
-LIB_DIRS+=$(PROJECT_TOP_DIR)
+TOP_LIB_DIRS+=.
 
 DEFINES_MINGW32+=