Changeset 699


Ignore:
Timestamp:
2005-04-21T20:09:41+02:00 (13 years ago)
Author:
nbd
Message:

fix sdk build

Location:
trunk/openwrt
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/Makefile

    r694 r699  
    113113endif 
    114114 
    115 sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE) 
     115sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE) openwrt-install 
    116116$(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install 
    117117 
  • trunk/openwrt/package/linux/linux.mk

    r687 r699  
    8080 
    8181$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC) 
    82         cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL) 
     82        cp -fa $< $@  
    8383        touch -c $(LINUX_KERNEL) 
     84         
     85$(LINUX_IMAGE): $(LINUX_KERNEL) 
     86        cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false) 
    8487 
    85 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) 
     88$(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE) 
    8689        rm -rf $(BUILD_DIR)/modules 
    8790        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules 
     
    103106# This has been renamed so we do _NOT_ by default run this on 'make clean' 
    104107linuxclean: clean 
    105         rm -f $(LINUX_KERNEL) 
     108        rm -f $(LINUX_KERNEL) $(LINUX_IMAGE) 
    106109        -$(MAKE) -C $(LINUX_DIR) clean 
    107110 
  • trunk/openwrt/target/Makefile

    r695 r699  
    2929endif 
    3030endef 
    31  
    32 $(LINUX_IMAGE): $(LINUX_KERNEL) 
    33         cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false) 
    3431 
    3532TARGET_DIRS:= 
     
    7572$(INSTALL_TARGET_DIRS): lzma-loader-compile 
    7673$(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS)) 
    77 compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader) 
    78 install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS) 
     74compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader utils) 
     75install: utils-install lzma-install $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS) 
    7976clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean 
    8077 
  • trunk/openwrt/target/utils/Makefile

    r307 r699  
    1313prepare: $(UTILS_BUILD_DIR) 
    1414compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) 
    15 install: compile 
    1615        mkdir -p $(STAGING_DIR)/bin 
    1716        cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ 
     17install: compile 
    1818package: 
    1919clean: 
Note: See TracChangeset for help on using the changeset viewer.