Changeset 695

Timestamp:

Nov 21, 2015, 11:13:26 PM (4 years ago)

Author:

amain

Message:

Fix clean target

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• debian/debian.mk (modified) (1 diff)

trunk/Makefile

@@ -35 +35 @@
 include config/config.mk
 
-ifeq ($(CONFIG_DEBWRT_FIRMWARE),n)
+ifeq ($(CONFIG_DEBWRT_FIRMWARE),y)
         include openwrt/openwrt.mk
         include openwrt/openwrt-deliver.mk
-test1:
-        echo "hoi"
 endif
 
@@ -72 +70 @@
         @echo "Note: wait a couple of minutes before rebooting your device. It takes time to write the firmware to the flash."
 
+ifeq ($(CONFIG_DEBWRT_FIRMWARE),n)
 clean: openwrt/clean debian/clean config/clean plugins/clean
         @rm -f .config .config.old
+else
+clean: debian/clean config/clean plugins/clean
+        @rm -f .config .config.old
+endif
 
 .PHONY: clean

trunk/debian/debian.mk

@@ -19 +19 @@
         include $(TOPDIR)/debian/buildenv/debian.mk
         include $(TOPDIR)/debian/package/debian.mk
+        DEBIAN_CLEAN+=debian/package/clean debian/buildenv/clean
 endif
 
 ifeq ($(CONFIG_ROOTFS_DEBIAN),y)
         include $(TOPDIR)/debian/rootfs/debian.mk
+        DEBIAN_CLEAN+=debian/rootfs/clean
 endif
 
 debian/all: 
 
-debian/clean: debian/package/clean debian/buildenv/clean debian/rootfs/clean
+debian/clean: $(DEBIAN_CLEAN)
 
 .PHONY: debian/all \