Changeset 279


Ignore:
Timestamp:
2005-02-21T07:03:54+01:00 (13 years ago)
Author:
wbx
Message:

remove DIST and add EXTRAVERSION, discussed with mbm. fixed dirclean target for linksys-stuff

Location:
trunk/openwrt
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/Makefile

    r272 r279  
    129129clean:  
    130130        rm -rf $(TARGET_DIR) $(IMAGE).* 
    131         $(MAKE) $(DIST)-image-clean 
     131        $(MAKE) openwrt-image-clean 
    132132 
    133133dirclean: $(TARGETS_DIRCLEAN) 
    134134        rm -rf $(TARGET_DIR) $(IMAGE).* 
    135         $(MAKE) $(DIST)-image-clean 
     135        $(MAKE) openwrt-image-dirclean 
    136136 
    137137distclean: clean 
  • trunk/openwrt/package/config/mconf.c

    r197 r279  
    706706                printf("\n\n" 
    707707                        "*** End of Buildroot configuration.\n" 
     708                        "*** After changing root fs, use make linux-dirclean.\n" 
    708709                        "*** Check the top-level Makefile for additional configuration options.\n\n"); 
    709710        } else 
  • trunk/openwrt/package/openwrt/openwrt.mk

    r277 r279  
    6363 
    6464linksys-nvram-dirclean: 
    65         rm -rf $(LINKSYS_NVRAM_BUILD_DIR) 
     65        rm -rf $(LINKSYS_NVRAM_DIR) 
    6666 
    6767# wlconf tool extracted from linksys firmware GPL sourcetree 
     
    9595 
    9696linksys-wlconf-dirclean: 
    97         rm -rf $(LINKSYS_WLCONF_BUILD_DIR) 
     97        rm -rf $(LINKSYS_WLCONF_DIR) 
    9898 
    9999# mtd tool 
     
    145145        rm $(OPENWRT_ADDPATTERN_TARGET) 
    146146 
    147 openwrt:        linksys-shared linksys-nvram linksys-wlconf openwrt-mtd openwrt-trx openwrt-addpattern 
     147linksys:        linksys-shared linksys-nvram linksys-wlconf 
    148148 
     149openwrt:        linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root 
     150 
     151openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean 
     152 
  • trunk/openwrt/target/Makefile.in

    r276 r279  
    11# Default target skeleton stuff, may be overridden 
    2 DIST=openwrt 
     2EXTRAVERSION= 
    33TARGET_SKELETON=target/default/skel.tar.gz 
    44TARGET_SKEL_DIR=target/default/target_skeleton 
     
    1111 
    1212 
    13 $(DIST)-linux.trx: openwrt-trx 
    14         PATH=$(TARGET_PATH) trx -o $(DIST)-linux.trx $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) 
     13openwrt-linux.trx: openwrt-trx 
     14        PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \ 
     15         $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) 
    1516 
    16 $(DIST)-gs-code.bin: openwrt-addpattern $(DIST)-linux.trx 
    17         PATH=$(TARGET_PATH) addpattern -2 -i  $(DIST)-linux.trx -o $(DIST)-gs-code.bin -g 
     17openwrt-gs-code.bin: openwrt-addpattern openwrt-linux.trx 
     18        PATH=$(TARGET_PATH) addpattern -2 -i  openwrt-linux$(EXTRAVERSION).trx \ 
     19        -o openwrt-gs-code$(EXTRAVERSION).bin -g 
    1820 
    19 $(DIST)-g-code.bin: $(DIST)-gs-code.bin 
    20         sed -e "1s,^W54S,W54G," < $(DIST)-gs-code.bin > $(DIST)-g-code.bin 
     21openwrt-g-code.bin: openwrt-gs-code.bin 
     22        sed -e "1s,^W54S,W54G," < openwrt-gs-code$(EXTRAVERSION).bin > openwrt-g-code$(EXTRAVERSION).bin 
    2123 
    22 openwrt-image:  openwrt $(DIST)-g-code.bin 
     24openwrt-image:  openwrt openwrt-g-code.bin 
    2325 
    24 $(DIST)-image-clean: 
    25         @-rm $(DIST)-* 2>/dev/null 
     26openwrt-image-clean:  
     27        @-rm openwrt-* 2>/dev/null 
     28 
     29openwrt-image-dirclean: openwrt-dirclean 
Note: See TracChangeset for help on using the changeset viewer.