Changeset 177 for trunk/libjdkmidi/trunk

Show
Ignore:
Timestamp:
11/09/06 07:08:27 (2 years ago)
Author:
jeffk@…
Message:

Magicmakefile configure now properly quotes options with spaces, has the option to target linux-i386 seperately from linux-ppc, and adds the 'disasm' target to disassemble all object files.

Location:
trunk/libjdkmidi/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/libjdkmidi/trunk/configure

    r122 r177  
    217217 
    218218# extract all environment vars with the "magic_" prefix and save them in vars.sh and Makefile in the appropriate form: 
    219  
    220 set | grep '^magic_' | awk -F= '{ sub("magic_","",$1); print $1 "=\"" $2 "\"" }' >vars.sh 
     219set | grep '^magic_' | sed "s/'//g" | awk -F= '{ sub("magic_","",$1); print $1 "=\"" $2 "\"" }' >vars.sh 
    221220echo ". \"${magic_PROJECT_TOP_DIR}/project.sh\"" >>vars.sh 
    222 set | grep '^magic_' | awk -F= '{ sub("magic_","",$1); print $1 "=" $2 }' >Makefile 
     221set | grep '^magic_' | sed "s/'//g" | awk -F= '{ sub("magic_","",$1); print $1 "=" $2 }' >Makefile 
    223222 
    224223echo 'include $(CONFIGURE_DIR)/project.mak' >>Makefile 
    … …  
    228227 mv ./reconfigure ./reconfigure-old 
    229228fi 
    230 echo "$0 $@ " '$@' >./reconfigure 
     229echo -n "$0 "  >>./reconfigure 
     230for i in "$@"; 
     231do 
     232  echo -n " \"$i\" " >> ./reconfigure 
     233done 
     234echo >>./reconfigure 
    231235chmod +x ./reconfigure 
    232236 

  • trunk/libjdkmidi/trunk/magic.mak

    r170 r177  
    5151PROJECT_CONFIG_TOOL?=$(PROJECT)-cfg 
    5252 
     53OBJDUMP?=$(COMPILER_PREFIX)objdump 
     54OBJDUMP_FLAGS?=-d -S 
    5355 
    5456 
    … …  
    156158# set the platform specific project compile flags 
    157159COMPILE_FLAGS+=$$(COMPILE_FLAGS_$(1)) 
     160 
     161# set the platform specific project pre-process flags 
     162PREPROCESS_FLAGS+=$$(PREPROCESS_FLAGS_$(1)) 
    158163 
    159164# set the platform specific project link flags 
    … …  
    202207NATIVE_COMPILE_FLAGS+=$$(COMPILE_FLAGS_$(1)) 
    203208 
     209# set the platform specific project preprocess flags 
     210NATIVE_PREPROCESS_FLAGS+=$$(PREPROCESS_FLAGS_$(1)) 
     211 
    204212# set the platform specific project link flags 
    205213NATIVE_LINK_FLAGS+=$$(LINK_FLAGS_$(1)) 
    … …  
    246254   $$(call get_rc_o_files,$$(LIB_$(1)_RC_FILES)) 
    247255 
     256LIB_$(1)_DISASM_FILES=$$(LIB_$(1)_O_FILES:.o=.disasm) 
     257 
    248258LIB_$(1)_EXE_FILES=$$(addprefix $$(OUTPUT_$(1)_DIR)/,$$(notdir $$(LIB_$(1)_O_FILES:.o=$$(EXE)))) 
    249259 
    … …  
    291301# The preprocessor flags is initially comprised of -I option for each include dir,  
    292302# and the -D option for each define 
    293 PREPROCESS_FLAGS=$(addprefix -I,$(INCLUDES)) $(addprefix -D,$(DEFINES))  
     303PREPROCESS_FLAGS+=$(addprefix -I,$(INCLUDES)) $(addprefix -D,$(DEFINES))  
    294304 
    295305# The compiler flag settings for optimization and warnings 
    … …  
    341351# CONFIG_TOOL_PREPROCESS_FLAGS is the preprocessor flags that the config tool script  
    342352# will output when given --cppflags 
    343 CONFIG_TOOL_PREPROCESS_FLAGS=$(addprefix -I,$(INSTALL_INCLUDE_DIR)) $(addprefix -D,$(DEFINES)) 
     353CONFIG_TOOL_PREPROCESS_FLAGS+=$(addprefix -I,$(INSTALL_INCLUDE_DIR)) $(addprefix -D,$(DEFINES)) 
    344354 
    345355# CONFIG_TOOL_COMPILE_FLAGS is the full compile flags that the config tool script  
    … …  
    373383ifeq ($(TARGET_PLATFORM_LINUX),1) 
    374384SUFFIXES_TARGET_PLATFORM=POSIX LINUX 
     385PLATFORM_DIRS+=posix linux 
     386endif 
     387 
     388 
     389# linux-i386 is a subset of linux, posix 
     390ifeq ($(TARGET_PLATFORM_LINUX_I386),1) 
     391SUFFIXES_TARGET_PLATFORM=POSIX LINUX LINUX_I386 
     392PLATFORM_DIRS+=posix linux 
     393endif 
     394 
     395# linux-ppc is a subset of linux, posix 
     396ifeq ($(TARGET_PLATFORM_LINUX_PPC),1) 
     397SUFFIXES_TARGET_PLATFORM=POSIX LINUX LINUX_PPC 
    375398PLATFORM_DIRS+=posix linux 
    376399endif 
    … …  
    462485 
    463486 
     487 
    464488NATIVE_USE_AR?=1 
    465489NATIVE_USE_MACOSX_LIBTOOL?=0 
    … …  
    489513ifeq ($(NATIVE_PLATFORM_LINUX),1) 
    490514SUFFIXES_NATIVE_PLATFORM=POSIX LINUX 
     515NATIVE_PLATFORM_GENERIC=0 
     516NATIVE_EXE= 
     517NATIVE_PLATFORM_DIRS+=posix linux 
     518endif 
     519 
     520ifeq ($(NATIVE_PLATFORM_LINUX_I386),1) 
     521SUFFIXES_NATIVE_PLATFORM=POSIX LINUX LINUX_I386 
     522NATIVE_PLATFORM_GENERIC=0 
     523NATIVE_EXE= 
     524NATIVE_PLATFORM_DIRS+=posix linux 
     525endif 
     526 
     527ifeq ($(NATIVE_PLATFORM_LINUX_PPC),1) 
     528SUFFIXES_NATIVE_PLATFORM=POSIX LINUX LINUX_PPC 
    491529NATIVE_PLATFORM_GENERIC=0 
    492530NATIVE_EXE= 
    … …  
    664702$(OUTPUT_OBJ_DIR)/%.o $(OUTPUT_OBJ_DIR)/%.d : %.m 
    665703   @echo "CC  m  : $(notdir $<)" 
    666    @$(CC) $(PREPROCESS_FLAGS)  $(MFLAGS) $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< && $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $< 
     704   @$(CC) $(PREPROCESS_FLAGS) $(MFLAGS) $(DEPENDENCY_OPTIONS) -MT  '$(OUTPUT_OBJ_DIR)'/$*.o -MF $(OUTPUT_OBJ_DIR)/$*.d $< &&  $(COMPILE.c) $(PREPROCESS_FLAGS) $(COMPILE_FLAGS) -o $(OUTPUT_OBJ_DIR)/$*.o $< 
    667705 
    668706# For C++: (cpp) 
    … …  
    686724   @$(COMPILE.rc) -I$(dir $<) $(PREPROCESS_FLAGS) $< $@ 
    687725 
     726# For disassembly of object files 
     727$(OUTPUT_OBJ_DIR)/%.disasm : $(OUTPUT_OBJ_DIR)/%.o 
     728   @echo "OBJDUMP     : $(notdir $<)" 
     729   @$(OBJDUMP) $(OBJDUMP_FLAGS) $< >$(OUTPUT_OBJ_DIR)/$*.disasm 
    688730 
    689731 
    … …  
    701743$(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.cpp 
    702744   @echo "NATIVE_CXX    : $(notdir $<)" 
    703    @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $< 
     745   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $< 
    704746 
    705747$(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.cc 
    706748   @echo "NATIVE_CXX    : $(notdir $<)" 
    707    @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS) $(DEPENDENCY_OPTIONS) -MT  '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $< 
     749   @$(NATIVE_CXX) $(NATIVE_PREPROCESS_FLAGS)  $(DEPENDENCY_OPTIONS) -MT  '$(NATIVE_OUTPUT_OBJ_DIR)'/$*.o -MF $(NATIVE_OUTPUT_OBJ_DIR)/$*.d $< && $(NATIVE_COMPILE.cpp) $(NATIVE_PREPROCESS_FLAGS) $(NATIVE_COMPILE_FLAGS) -o $(NATIVE_OUTPUT_OBJ_DIR)/$*.o $< 
    708750 
    709751$(NATIVE_OUTPUT_OBJ_DIR)/%.o $(NATIVE_OUTPUT_OBJ_DIR)/%.d : %.c 
    … …  
    766808   $(call get_mm_o_files,$(LIB_MM_FILES)) \ 
    767809   $(call get_rc_o_files,$(LIB_RC_FILES))  
     810 
     811LIB_DISASM_FILES=$(LIB_O_FILES:.o=.disasm) 
    768812 
    769813 
    … …  
    10981142 
    10991143endif 
     1144 
     1145.PHONY : disasm 
     1146 
     1147disasm :  $(LIB_DISASM_FILES) $(LIB_EXAMPLES_DISASM_FILES) $(LIB_TOOLS_DISASM_FILES) $(LIB_TESTS_DISASM_FILES) 
     1148 
    11001149 
    11011150.PHONY : config-tool 
    … …  
    12141263 
    12151264 
    1216  
    1217