diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-06 09:56:30 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-06 09:56:30 +0000 |
| commit | b0797ce463f7f352df845dd988a4d67cd5ede7c1 (patch) | |
| tree | dce62e287fbe731c3768d7f99aabafe3a0b1a785 /target/linux/ixp4xx/image/Makefile | |
| parent | cf71c75acc0b4b9d86a46b3b07a3070d531c7b21 (diff) | |
ixp4xx: make apex optional, clean up the makefile - fixes spurious recompilation issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15115 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/image/Makefile')
| -rw-r--r-- | target/linux/ixp4xx/image/Makefile | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile index 53d2ef0f6..82f2e96d5 100644 --- a/target/linux/ixp4xx/image/Makefile +++ b/target/linux/ixp4xx/image/Makefile @@ -7,18 +7,20 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -define Image/Build/Linksys +ifdef CONFIG_PACKAGE_apex + define Image/Build/Linksys BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ - -L $(BIN_DIR)/apex-$(2)-armeb.bin \ + -L $(BIN_DIR)/apex/apex-$(2)-armeb.bin \ -k $(BIN_DIR)/openwrt-$(2)-zImage \ -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \ -p -o $(BIN_DIR)/openwrt-$(2)-$(1).bin BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ - -F -L $(BIN_DIR)/apex-$(2)-16mb-armeb.bin \ + -F -L $(BIN_DIR)/apex/apex-$(2)-16mb-armeb.bin \ -k $(BIN_DIR)/openwrt-$(2)-zImage \ -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \ -p -o $(BIN_DIR)/openwrt-$(2)-$(1)-16mb.bin -endef + endef +endif define Image/Build/Freecom $(INSTALL_DIR) $(TARGET_DIR)/boot @@ -30,18 +32,6 @@ define Image/Build/Freecom $(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img endef -define Build/Compile - mkdir -p $(BIN_DIR) - $(MAKE) -C apex \ - BUILD_DIR="$(KDIR)" \ - TARGET="$(BIN_DIR)" \ - compile -endef - -define Build/Clean - $(MAKE) -C apex clean -endef - define Image/Prepare cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/zImage endef |