Changeset 279

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:

• Makefile (modified) (1 diff)
• package/config/mconf.c (modified) (1 diff)
• package/openwrt/openwrt.mk (modified) (3 diffs)
• target/Makefile.in (modified) (2 diffs)

trunk/openwrt/Makefile

@@ -129 +129 @@
 clean: 
         rm -rf $(TARGET_DIR) $(IMAGE).*
-        $(MAKE) $(DIST)-image-clean
+        $(MAKE) openwrt-image-clean
 
 dirclean: $(TARGETS_DIRCLEAN)
         rm -rf $(TARGET_DIR) $(IMAGE).*
-        $(MAKE) $(DIST)-image-clean
+        $(MAKE) openwrt-image-dirclean
 
 distclean: clean

trunk/openwrt/package/config/mconf.c

@@ -706 +706 @@
                 printf("\n\n"
                         "*** End of Buildroot configuration.\n"
+                        "*** After changing root fs, use make linux-dirclean.\n"
                         "*** Check the top-level Makefile for additional configuration options.\n\n");
         } else

trunk/openwrt/package/openwrt/openwrt.mk

@@ -63 +63 @@
 
 linksys-nvram-dirclean:
-        rm -rf $(LINKSYS_NVRAM_BUILD_DIR)
+        rm -rf $(LINKSYS_NVRAM_DIR)
 
 # wlconf tool extracted from linksys firmware GPL sourcetree
@@ -95 +95 @@
 
 linksys-wlconf-dirclean:
-        rm -rf $(LINKSYS_WLCONF_BUILD_DIR)
+        rm -rf $(LINKSYS_WLCONF_DIR)
 
 # mtd tool
@@ -145 +145 @@
         rm $(OPENWRT_ADDPATTERN_TARGET)
 
-openwrt:        linksys-shared linksys-nvram linksys-wlconf openwrt-mtd openwrt-trx openwrt-addpattern
+linksys:        linksys-shared linksys-nvram linksys-wlconf
 
+openwrt:        linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root
+
+openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean
+

trunk/openwrt/target/Makefile.in

@@ -1 +1 @@
 # Default target skeleton stuff, may be overridden
-DIST=openwrt
+EXTRAVERSION=
 TARGET_SKELETON=target/default/skel.tar.gz
 TARGET_SKEL_DIR=target/default/target_skeleton
@@ -11 +11 @@
 
 
-$(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