[bcm47xx] Stopgap compilation fixes for diag and switch under 2.6.25

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 85091f6..8b0ef0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,133 +1,76 @@
 # Makefile for OpenWrt
 #
 # Makefile for OpenWrt
 #

-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2006 by Felix Fietkau <openwrt@nbd.name>
+# Copyright (C) 2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 

-RELEASE:=Kamikaze
-#VERSION:=2.0 # uncomment for final release
+TOPDIR:=${CURDIR}
+LC_ALL:=C
+LANG:=C
+export TOPDIR LC_ALL LANG

 
 

-#--------------------------------------------------------------
-# Just run 'make menuconfig', configure stuff, then run 'make'.
-# You shouldn't need to mess with anything beyond this point...
-#--------------------------------------------------------------
-TOPDIR=${shell pwd}
-export TOPDIR
-include $(TOPDIR)/include/verbose.mk
+world:

 
 

-OPENWRTVERSION:=$(RELEASE)
-ifneq ($(VERSION),)
-OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
-else
-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifneq ($(REV),)
-OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-endif
-endif
-export OPENWRTVERSION
-
-all: world
-
-ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
-.pkginfo: FORCE
-.config: FORCE
-endif
-
-.pkginfo:
-       @echo Collecting package info...
-       @-for dir in package/*/; do \
-               echo Source-Makefile: $${dir}Makefile; \
-               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
-       done > $@
-
-.config.in: .pkginfo
-       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
-
-pkginfo-clean: FORCE
-       -rm -f .pkginfo .config.in
-
-./scripts/config/mconf: .config.in
-       @$(MAKE) -C scripts/config all
-
-./scripts/config/conf: .config.in
-       @$(MAKE) -C scripts/config conf
-
-config: ./scripts/config/conf FORCE
-       $< Config.in
-
-defconfig: ./scripts/config/conf FORCE
-       touch .config
-       $< -D .config Config.in
-
-oldconfig: ./scripts/config/conf FORCE
-       $< -o Config.in
+include $(TOPDIR)/include/host.mk

 
 

-menuconfig: ./scripts/config/mconf FORCE
-       $< Config.in
-
-config-clean: FORCE
-       $(NO_TRACE_MAKE) -C scripts/config clean
-
-package/%: .pkginfo FORCE
-       $(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%: .pkginfo FORCE
-       $(MAKE) -C target $(patsubst target/%,%,$@)
-
-toolchain/%: FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
-
-.config: ./scripts/config/conf
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       @$< -D .config Config.in &> /dev/null
-
-.prereq-build: $(TOPDIR)/include/prereq-build.mk
-       @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
+ifneq ($(OPENWRT_BUILD),1)
+  override OPENWRT_BUILD=1
+  export OPENWRT_BUILD
+  include $(TOPDIR)/include/debug.mk
+  include $(TOPDIR)/include/depends.mk
+  include $(TOPDIR)/include/toplevel.mk
+else
+  include rules.mk
+  include $(INCLUDE_DIR)/depends.mk
+  include $(INCLUDE_DIR)/subdir.mk
+  include target/Makefile
+  include package/Makefile
+  include tools/Makefile
+  include toolchain/Makefile
+
+$(toolchain/stamp-install): $(tools/stamp-install)
+$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared
+$(package/stamp-cleanup): $(target/stamp-compile)
+$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
+$(package/stamp-install): $(package/stamp-compile)
+$(package/stamp-rootfs-prepare): $(package/stamp-install)
+$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare)
+
+$(BUILD_DIR)/.prepared: Makefile
+       @mkdir -p $$(dirname $@)

        @touch $@
 
        @touch $@
 

-.prereq-packages: $(TOPDIR)/include/prereq.mk .pkginfo .config
-       @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       @touch $@
-       
-prereq: .prereq-build .prereq-packages FORCE
+clean: FORCE
+       rm -rf $(BUILD_DIR) $(BIN_DIR)
+       $(MAKE) target/linux/clean

 
 

-download: .config FORCE
-       $(MAKE) toolchain/download
-       $(MAKE) package/download
-       $(MAKE) target/download
+dirclean: clean
+       rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)
+       rm -rf $(TMP_DIR)

 
 

-ifeq ($(FORCE),)
-.config ./scripts/config/conf ./scripts/config/mconf: .prereq-build
-world: .prereq-packages
-endif
+# check prerequisites before starting to build
+prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;

 
 

-world: .config FORCE
-       $(MAKE) toolchain/install
-       $(MAKE) target/compile
-       $(MAKE) package/compile
-       $(MAKE) package/install
-       $(MAKE) target/install
+prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
+world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE

        $(MAKE) package/index
 
        $(MAKE) package/index
 

-clean: FORCE
-       rm -rf build_* bin
+# update all feeds, re-create index files, install symlinks
+package/symlinks:
+       $(SCRIPT_DIR)/feeds update -a
+       $(SCRIPT_DIR)/feeds install -a

 
 

-dirclean: clean
-       rm -rf staging_dir_* toolchain_build_*
+# re-create index files, install symlinks
+package/symlinks-install:
+       $(SCRIPT_DIR)/feeds update -i
+       $(SCRIPT_DIR)/feeds install -a

 
 

-distclean: dirclean config-clean
-       rm -rf dl .*config* .pkg* .prereq
+# remove all symlinks, don't touch ./feeds
+package/symlinks-clean:
+       $(SCRIPT_DIR)/feeds uninstall -a

 
 

+.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean

 
 

-.SILENT: clean dirclean distclean config-clean download world
-.PHONY: FORCE
-FORCE:
+endif