Changeset 225 for trunk/libjdkmidi/trunk

Show
Ignore:
Timestamp:
11/13/06 13:34:58 (2 years ago)
Author:
jeffk@…
Message:

magic.mak and configure resynced

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/libjdkmidi/trunk/magic.mak

    r218 r225  
    943943   @$$(LINK.cpp) $$(LINK_FLAGS) $$(LDFLAGS) $$(LINK_FLAGS_GUI) -o $$@ $$^ -L$$(OUTPUT_LIB_DIR) $$(PROJECT_LDLIB) $$(LDLIBS) $$(LDLIBS_GUI) 
    944944 
    945  
    946945endef 
    947946 
     947ifneq ($(MAKE_VERSION),3.80) 
    948948ifeq ($(TARGET_PLATFORM_MINGW32),1) 
    949949$(foreach prog,$(call bare_subdirs_in_path,$(PROJECT_TOP_DIR)/gui/win32),$(eval $(call win32_gui_program,$(prog)))) 
     950endif 
    950951endif 
    951952 
    … …  
    10151016.PHONY : install 
    10161017 
    1017 install : lib tools tests examples  
     1018install : all 
    10181019   @-$(MKDIR) -p $(INSTALL_BIN_DIR) 
    10191020   @for i in $(LIB_TOOLS_EXE_FILES) $(LIB_GUI_EXE_FILES); do echo "$${i}"; $(INSTALL) "$${i}" "$(INSTALL_BIN_DIR)"; done 
     1021   @$(CP) -rp $(OUTPUT_TOOLS_DIR) $(INSTALL_DIR) 
     1022   @$(CP) -rp $(OUTPUT_GUI_DIR) $(INSTALL_DIR)  
     1023 
    10201024 
    10211025.PHONY : install-dev 
    … …  
    10251029   @for i in $(LIB_INCLUDE_DIR); do if [ -d "$${i}" ]; then $(RSYNC) $(RSYNC_OPTIONS) "$${i}"/* $(INSTALL_INCLUDE_DIR); fi; done 
    10261030   @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_LIB) $(INSTALL_LIB_DIR)  
    1027    @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_TESTS_DIR) $(INSTALL_LIB_DIR)  
    1028    @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_TOOLS_DIR) $(INSTALL_LIB_DIR)  
    1029    @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_GUI_DIR) $(INSTALL_LIB_DIR)  
    1030    @$(RSYNC) $(RSYNC_OPTIONS) $(OUTPUT_EXAMPLES_DIR) $(INSTALL_LIB_DIR)  
     1031   @$(CP) -rp $(OUTPUT_TESTS_DIR) $(INSTALL_DIR) 
     1032   @$(CP) -rp $(OUTPUT_EXAMPLES_DIR) $(INSTALL_DIR)  
    10311033   @echo $(PROJECT_CONFIG_TOOL) 
    10321034   @$(INSTALL) "$(CONFIG_TOOL_FILE)" "$(INSTALL_BIN_DIR)"