Changeset 259 for trunk/libjdkmidi/trunk

Timestamp:

12/31/06 08:08:21 (23 months ago)

Author:

jeffk@…

Message:

all magic.mak and configure scripts resynced from magicmakefile/trunk

Files:

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

trunk/libjdkmidi/trunk/magic.mak

@@ -52 +52 @@
 
 OBJDUMP?=$(COMPILER_PREFIX)objdump
-OBJDUMP_FLAGS?=-d -S
-
+OBJDUMP_FLAGS?=-d -C
+LIPO?=$(COMPILER_PREFIX)lipo
 
 ##############################################################################################
@@ -256 +256 @@
 LIB_$(1)_DISASM_FILES=$$(LIB_$(1)_O_FILES:.o=.disasm)
 
+LIB_$(1)_ASM_FILES=$$(LIB_$(1)_O_FILES:.o=.asm)
+
 LIB_$(1)_EXE_FILES=$$(addprefix $$(OUTPUT_$(1)_DIR)/,$$(notdir $$(LIB_$(1)_O_FILES:.o=$$(EXE))))
 
@@ -403 +405 @@
 SUFFIXES_TARGET_PLATFORM=POSIX MACOSX
 PLATFORM_DIRS+=posix macosx
+DISASM=otool
+DISASM_FLAGS=-t -v -V
 endif
 
@@ -409 +413 @@
 SUFFIXES_TARGET_PLATFORM=POSIX MACOSX MACOSX_PPC
 PLATFORM_DIRS+=posix macosx macosx-ppc
+DISASM=otool
+DISASM_FLAGS=-t -v -V
 endif
 
@@ -415 +421 @@
 SUFFIXES_TARGET_PLATFORM=POSIX MACOSX MACOSX_I386
 PLATFORM_DIRS+=posix macosx macosx-i386
-endif
+DISASM=otool
+DISASM_FLAGS=-t -v -V
+endif
+
 
 # macosx_universal is a subset of macosx and posix and uses mac libtool to generate fat binaries.
 ifeq ($(TARGET_PLATFORM_MACOSX_UNIVERSAL),1)
+MACOSX_UNIVERSAL_ARCHS?=i386 ppc
+MACOSX_UNIVERSAL_ARCHS_PARAMS=$(foreach a,$(MACOSX_UNIVERSAL_ARCHS),-arch $(a))
 SUFFIXES_TARGET_PLATFORM=POSIX MACOSX MACOSX_UNIVERSAL
 PLATFORM_DIRS+=posix macosx macosx-ppc macosx-i386
 TARGET_MACOSX_SDK?=/Developer/SDKs/MacOSX10.4u.sdk
-COMPILE_FLAGS+=-isysroot $(TARGET_MACOSX_SDK) -arch i386 -arch ppc
-LINK_FLAGS+=-isysroot $(TARGET_MACOSX_SDK) -arch i386 -arch ppc
+COMPILE_FLAGS+=-isysroot $(TARGET_MACOSX_SDK) $(MACOSX_UNIVERSAL_ARCHS_PARAMS)
+LINK_FLAGS+=-isysroot $(TARGET_MACOSX_SDK) $(MACOSX_UNIVERSAL_ARCHS_PARAMS)
 TARGET_USE_AR=0
 TARGET_USE_MACOSX_LIBTOOL=1
 MACOSX_LIBTOOL=libtool
 MACOSX_LIBTOOLFLAGS?=-static
-endif
+DISASM=otool
+DISASM_FLAGS=-t -v -V
+endif
+
+# cell_spu is not a posix platform
+ifeq ($(TARGET_PLATFORM_CELL_SPU),1)
+SUFFIXES_TARGET_PLATFORM=CELL_SPU
+PLATFORM_DIRS+=cell_spu
+endif
+
+# linux_cell_ppu is a subset of linux-ppc, linux, posix
+ifeq ($(TARGET_PLATFORM_LINUX_CELL_PPU),1)
+SUFFIXES_TARGET_PLATFORM=POSIX LINUX LINUX_PPC LINUX_CELL_PPU CELL_PPU
+PLATFORM_DIRS+=posix linux cell_ppu
+endif
+
+# default to objdump for disassembly
+DISASM_FLAGS?=-d -S
+DISASM?=$(OBJDUMP)
 
 # if EXE suffix is not set then it ought to be blank.
@@ -537 +566 @@
 NATIVE_EXE=
 NATIVE_PLATFORM_DIRS+=posix macosx
+NATIVE_DISASM=otool
+NATIVE_DISASM_FLAGS=-t -v -V
 endif
 
@@ -544 +575 @@
 NATIVE_EXE=
 NATIVE_PLATFORM_DIRS+=posix macosx macosx-ppc
+NATIVE_DISASM=otool
+NATIVE_DISASM_FLAGS=-t -v -V
 endif
 
@@ -551 +584 @@
 NATIVE_EXE=
 NATIVE_PLATFORM_DIRS+=posix macosx macosx-i386
+NATIVE_DISASM=otool
+NATIVE_DISASM_FLAGS=-t -v -V
 endif
 
@@ -565 +600 @@
 NATIVE_MACOSX_LIBTOOL=libtool
 NATIVE_MACOSX_LIBTOOLFLAGS?=-static
-endif
-
+NATIVE_DISASM=otool
+NATIVE_DISASM_FLAGS=-t -v -V
+endif
+
+
+# cell_spu 
+ifeq ($(NATIVE_PLATFORM_CELL_SPU),1)
+SUFFIXES_NATIVE_PLATFORM=CELL_SPU
+NATIVE_PLATFORM_DIRS+=cell_spu
+endif
+
+# linux_cell_ppu is a subset of linux-ppc, linux, posix
+ifeq ($(NATIVE_PLATFORM_LINUX_CELL_PPU),1)
+SUFFIXES_NARIVE_PLATFORM=POSIX LINUX LINUX_PPC LINUX_CELL_PPU CELL_PPU
+NATIVE_PLATFORM_DIRS+=posix linux cell_ppu
+endif
+
+# default to objdump for disassembly
+NATIVE_DISASM_FLAGS?=-d -S
+NATIVE_DISASM?=$(OBJDUMP)
 
 $(eval $(call calc_multi_native_options,$(SUFFIXES_NATIVE_PLATFORM)))
@@ -709 +762 @@
    @$(CXX) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cpp) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
+# Asm For C++: (cpp)
+$(OUTPUT_OBJ_DIR)/%.asm : %.cpp
+   @echo "CXX asm  : $(notdir $<)"
+   @$(COMPILE.cc) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -S -o $(OUTPUT_OBJ_DIR)/$*.asm $<
+
 # For C++: (cc)
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.cc
@@ -714 +772 @@
    @$(CXX) $(PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.cc) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $<
 
+# Asm For C++: (cc)
+$(OUTPUT_OBJ_DIR)/%.asm : %.cc
+   @echo "CXX asm  : $(notdir $<)"
+   @$(COMPILE.cc) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -S -o $(OUTPUT_OBJ_DIR)/$*.asm $<
+
 # For C:
 $(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.c
@@ -719 +782 @@
    @$(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 $<
 
+# Asm For C:
+$(OUTPUT_OBJ_DIR)/%.asm : %.c
+   @echo "C asm  : $(notdir $<)"
+   @$(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -S -o $(OUTPUT_OBJ_DIR)/$*.asm $<
+
 # For RC (windows):
 $(OUTPUT_OBJ_DIR)/%.o : %.rc
@@ -724 +792 @@
    @$(COMPILE.rc) -I$(dir $<) $(PREPROCESS_FLAGS) $< $@
 
+ifeq ($(TARGET_PLATFORM_MACOSX_UNIVERSAL),1)
+# For disassembly of object files for mac 'fat' binaries, i386 and ppc archs
+$(OUTPUT_OBJ_DIR)/%.disasm : $(OUTPUT_OBJ_DIR)/%.o
+   @echo "DISASM (2)  : $(notdir $<)"
+   @echo '# disassembly of ' $(notdir $<) >$(OUTPUT_OBJ_DIR)/$*.disasm
+   @for i in $(MACOSX_UNIVERSAL_ARCHS); do \
+      echo '#---------- ' $$i >>$(OUTPUT_OBJ_DIR)/$*.disasm; \
+      $(LIPO) -thin $$i $< -o $(OUTPUT_OBJ_DIR)/$*.$$i.o && \
+      $(DISASM) $(DISASM_FLAGS) $(OUTPUT_OBJ_DIR)/$*.$$i.o >>$(OUTPUT_OBJ_DIR)/$*.disasm; \
+      $(RM) $(OUTPUT_OBJ_DIR)/$*.$$i.o; \
+   done
+else
 # For disassembly of object files
 $(OUTPUT_OBJ_DIR)/%.disasm : $(OUTPUT_OBJ_DIR)/%.o
-   @echo "OBJDUMP     : $(notdir $<)"
+   @echo "DISASM      : $(notdir $<)"
    @$(OBJDUMP) $(OBJDUMP_FLAGS) $< >$(OUTPUT_OBJ_DIR)/$*.disasm
-
+endif
 
 
@@ -810 +890 @@
 
 LIB_DISASM_FILES=$(LIB_O_FILES:.o=.disasm)
+LIB_ASM_FILES=$(LIB_O_FILES:.o=.asm)
 
 
@@ -943 +1024 @@
    @$$(LINK.cpp) $$(LINK_FLAGS) $$(LDFLAGS) $$(LINK_FLAGS_GUI) -o $$@ $$^ -L$$(OUTPUT_LIB_DIR) $$(PROJECT_LDLIB) $$(LDLIBS) $$(LDLIBS_GUI)
 
+
 endef
 
-ifneq ($(MAKE_VERSION),3.80)
 ifeq ($(TARGET_PLATFORM_MINGW32),1)
 $(foreach prog,$(call bare_subdirs_in_path,$(PROJECT_TOP_DIR)/gui/win32),$(eval $(call win32_gui_program,$(prog))))
 endif
-endif
 
 
 .PHONY : all
 
+ifdef ALL
+all : $(ALL)
+else
 ifeq ($(CROSS_COMPILING),1)
 all : native-dirs dirs native-lib native-tools native-tests native-examples dirs lib tools tests examples gui
@@ -959 +1042 @@
 all : dirs lib tools tests examples gui
 endif
-
+endif
 
 .PHONY : dirs
@@ -1016 +1099 @@
 .PHONY : install
 
-install : all
+install : lib tools tests examples 
    @-$(MKDIR) -p $(INSTALL_BIN_DIR)
    @for i in $(LIB_TOOLS_EXE_FILES) $(LIB_GUI_EXE_FILES); do echo "$${i}"; $(INSTALL) "$${i}" "$(INSTALL_BIN_DIR)"; done
-   @$(CP) -rp $(OUTPUT_GUI_DIR) $(INSTALL_DIR) 
-
 
 .PHONY : install-dev
@@ -1028 +1109 @@
    @for i in $(LIB_INCLUDE_DIR); do if [ -d "$${i}" ]; then $(RSYNC) $(RSYNC_OPTIONS) "$${i}"/* $(INSTALL_INCLUDE_DIR); fi; done
    @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_LIB) $(INSTALL_LIB_DIR) 
-   @$(CP) -rp $(OUTPUT_TESTS_DIR) $(INSTALL_DIR)
-   @$(CP) -rp $(OUTPUT_EXAMPLES_DIR) $(INSTALL_DIR) 
    @echo $(PROJECT_CONFIG_TOOL)
    @$(INSTALL) "$(CONFIG_TOOL_FILE)" "$(INSTALL_BIN_DIR)"
@@ -1152 +1231 @@
 disasm :  $(LIB_DISASM_FILES) $(LIB_EXAMPLES_DISASM_FILES) $(LIB_TOOLS_DISASM_FILES) $(LIB_TESTS_DISASM_FILES)
 
+.PHONY : asm
+
+asm :  $(LIB_ASM_FILES) 
 
 .PHONY : config-tool
@@ -1182 +1264 @@
    @echo "RANLIB : $(RANLIB)"
    @echo "COMPILE_FLAGS: $(COMPILE_FLAGS)"
+   @echo "PREPROCESS_FLAGS: $(PREPROCESS_FLAGS)"
    @echo "LINK_FLAGS: $(LINK_FLAGS)"
    @echo "LDLIBS: $(LDLIBS)"