X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2FMakefile.in;h=22cd7a4208ed34a3dc336ee9586a84c59bb3604b;hb=2b0be6bb82f0402e50c11bb72b41bd4ec9589a66;hp=7a212e489f82ba07840acb603df7b84a53fa7901;hpb=663888501e27e6bfcd01bd0f43620b9d08cd2b7b;p=openwrt-10.03%2F.git

diff --git a/target/Makefile.in b/target/Makefile.in
index 7a212e489..22cd7a420 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -1,25 +1,30 @@
 # Default target skeleton stuff, may be overridden
-DIST=openwrt
+EXTRAVERSION=
 TARGET_SKELETON=target/default/skel.tar.gz
 TARGET_SKEL_DIR=target/default/target_skeleton
 
 include target/device/Makefile.in
 
 ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-JFFS2FLAGS+=-a 131072
+include target/jffs2/blocksize.mk
+JFFS2FLAGS+=-a $(JFFS2_BLOCK_SIZE) 
 endif
 
 
-$(DIST)-linux.trx: openwrt-trx
-	PATH=$(TARGET_PATH) trx -o $(DIST)-linux.trx $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS)
+openwrt-linux.trx: openwrt-trx
+	PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \
+	 $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS)
 
-$(DIST)-gs-code.bin: openwrt-addpattern $(DIST)-linux.trx
-	PATH=$(TARGET_PATH) addpattern -2 -i  $(DIST)-linux.trx -o $(DIST)-gs-code.bin -g
+openwrt-gs-code.bin: openwrt-addpattern openwrt-linux.trx
+	PATH=$(TARGET_PATH) addpattern -2 -i  openwrt-linux$(EXTRAVERSION).trx \
+	-o openwrt-gs-code$(EXTRAVERSION).bin -g
 
-$(DIST)-g-code.bin: $(DIST)-gs-code.bin
-	sed -e "1s,^W54S,W54G," < $(DIST)-gs-code.bin > $(DIST)-g-code.bin
+openwrt-g-code.bin: openwrt-gs-code.bin
+	sed -e "1s,^W54S,W54G," < openwrt-gs-code$(EXTRAVERSION).bin > openwrt-g-code$(EXTRAVERSION).bin
 
-openwrt-image:	openwrt $(DIST)-g-code.bin
+openwrt-image:	openwrt openwrt-g-code.bin
 
-$(DIST)-image-clean:
-	@-rm $(DIST)-* 2>/dev/null
+openwrt-image-clean: 
+	@-rm openwrt-* 2>/dev/null
+
+openwrt-image-dirclean: openwrt-dirclean