Match package config. variables with their directory names

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index dc52dfd..cd94233 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-# Makefile for buildroot2
+# Makefile for OpenWRT

 #
 #

+# Copyright (C) 2005 by Felix Fietkau <nbd@vd-s.ath.cx>

 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
 # This program is free software; you can redistribute it and/or modify


@@ -21,8 +22,13 @@
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------

-TOPDIR=./
+TOPDIR=${shell pwd}
+export TOPDIR
+ifneq ($(DEVELOPER),)
+CONFIG_CONFIG_IN = Config.in.devel
+else

 CONFIG_CONFIG_IN = Config.in
 CONFIG_CONFIG_IN = Config.in

+endif

 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 
 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 


@@ -31,30 +37,35 @@ noconfig_targets := menuconfig config oldconfig randconfig \
 
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)

--include $(TOPDIR).config
-endif
-
-ifeq ($(BR2_TAR_VERBOSITY),y)
-TAR_OPTIONS=-xvf
-else
-TAR_OPTIONS=-xf
+-include $(TOPDIR)/.config

 endif
 
 ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 endif
 
 ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)

+include $(TOPDIR)/rules.mk

 
 

-#############################################################
+all: world
+
+.NOTPARALLEL:
+
+##############################################################

 #
 #

-# The list of stuff to build for the target toolchain
-# along with the packages to build for the target.
+# Build the toolchain

 #
 ##############################################################
 #
 ##############################################################

-TARGETS:=host-sed linux-headers uclibc-configured binutils gcc uclibc-target-utils
-include toolchain/Makefile.in
-include toolchain/*/Makefile.in
-include package/Makefile.in
-include package/*/Makefile.in
-include target/Makefile.in
-include target/*/Makefile.in
+toolchain_install:
+       $(MAKE) -C toolchain install
+
+##############################################################
+#
+# Make all packages
+#
+##############################################################
+
+package_compile: target_compile
+       $(MAKE) -C package compile
+
+package_install: package_compile toolchain
+       $(MAKE) -C package install

 
 #############################################################
 #
 
 #############################################################
 #


@@ -64,51 +75,37 @@ include target/*/Makefile.in
 #############################################################
 
 
 #############################################################
 
 

-
-all:   world
-

 # In this section, we need .config
 include .config.cmd
 
 # In this section, we need .config
 include .config.cmd
 

-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
+world: $(DL_DIR) $(BUILD_DIR) configtest target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index

 
 

-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install configtest

 
 

-.PHONY: all world clean distclean source $(TARGETS) \
-       $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-       $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
+configtest:
+       -cp .config .config.test
+       -scripts/configtest.pl

 
 

-include toolchain/*/*.mk
-include package/*/*.mk
-include target/*/*.mk
+package_index:
+       (cd $(PACKAGE_DIR); \
+               $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
+       )
+
+target_prepare:
+       $(MAKE) -C target prepare
+
+target_compile:
+       $(MAKE) -C target compile
+
+target_install:
+       $(MAKE) -C target install

 
 

-#############################################################
-#
-# staging and target directories do NOT list these as
-# dependancies anywhere else
-#
-#############################################################

 $(DL_DIR):
        @mkdir -p $(DL_DIR)
 
 $(BUILD_DIR):
        @mkdir -p $(BUILD_DIR)
 
 $(DL_DIR):
        @mkdir -p $(DL_DIR)
 
 $(BUILD_DIR):
        @mkdir -p $(BUILD_DIR)
 

-$(TOOL_BUILD_DIR):
-       @mkdir -p $(TOOL_BUILD_DIR)
-
-$(STAGING_DIR):
-       @mkdir -p $(STAGING_DIR)/lib
-       @mkdir -p $(STAGING_DIR)/include
-       @mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-       @ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
-
-$(TARGET_DIR):
-       zcat target/default/skel.tar.gz | tar -C $(BUILD_DIR) -xf -
-       cp -a target/default/target_skeleton/* $(TARGET_DIR)/
-       -find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
-

 source: $(TARGETS_SOURCE)
 
 #############################################################
 source: $(TARGETS_SOURCE)
 
 #############################################################


@@ -116,22 +113,31 @@ source: $(TARGETS_SOURCE)
 # Cleanup and misc junk
 #
 #############################################################
 # Cleanup and misc junk
 #
 #############################################################

-clean:
-       rm -rf $(BUILD_DIR) $(IMAGE).*
+image_clean:
+       rm -f $(STAMP_DIR)/.*-compile
+       rm -f $(STAMP_DIR)/.*-install
+       rm -rf $(BIN_DIR)
+       
+target_clean: image_clean
+       rm -rf $(TARGET_DIR)
+
+clean: target_clean

        @$(MAKE) -C $(CONFIG) clean
 
        @$(MAKE) -C $(CONFIG) clean
 

+dirclean: clean
+       rm -rf $(BUILD_DIR)
+

 distclean: clean
 distclean: clean

-       rm -rf $(DL_DIR) $(TOOL_BUILD_DIR) .config
+       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
+       rm -f .config* .tmpconfig.h

 
 

-sourceball:
-       rm -rf $(BUILD_DIR)
+sourceball: distclean

        set -e; \
        cd ..; \
        rm -f buildroot.tar.bz2; \
        tar -cvf buildroot.tar buildroot; \
        bzip2 -9 buildroot.tar; \
 
        set -e; \
        cd ..; \
        rm -f buildroot.tar.bz2; \
        tar -cvf buildroot.tar buildroot; \
        bzip2 -9 buildroot.tar; \
 

-

 else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 all: menuconfig
 else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 all: menuconfig


@@ -145,47 +151,57 @@ $(CONFIG)/conf:
                cp $(CONFIG_DEFCONFIG) .config; \
        fi
 $(CONFIG)/mconf:
                cp $(CONFIG_DEFCONFIG) .config; \
        fi
 $(CONFIG)/mconf:

-       $(MAKE) -C $(CONFIG) ncurses conf mconf
+       $(MAKE) -C $(CONFIG) 

        -@if [ ! -f .config ] ; then \
                cp $(CONFIG_DEFCONFIG) .config; \
        fi
 
 menuconfig: $(CONFIG)/mconf
        -@if [ ! -f .config ] ; then \
                cp $(CONFIG_DEFCONFIG) .config; \
        fi
 
 menuconfig: $(CONFIG)/mconf

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
        @$(CONFIG)/mconf $(CONFIG_CONFIG_IN)

+       -./scripts/configtest.pl

 
 config: $(CONFIG)/conf
 
 config: $(CONFIG)/conf

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/conf $(CONFIG_CONFIG_IN)
        @$(CONFIG)/conf $(CONFIG_CONFIG_IN)

+       -./scripts/configtest.pl

 
 oldconfig: $(CONFIG)/conf
 
 oldconfig: $(CONFIG)/conf

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
        @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)

+       -./scripts/configtest.pl

 
 randconfig: $(CONFIG)/conf
 
 randconfig: $(CONFIG)/conf

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
        @$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)

+       -./scripts/configtest.pl

 
 allyesconfig: $(CONFIG)/conf
        #@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
        #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config
 
 allyesconfig: $(CONFIG)/conf
        #@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
        #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
        @$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)

+       -./scripts/configtest.pl

 
 allnoconfig: $(CONFIG)/conf
 
 allnoconfig: $(CONFIG)/conf

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
        @$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)

+       -./scripts/configtest.pl

 
 defconfig: $(CONFIG)/conf
 
 defconfig: $(CONFIG)/conf

+       -touch .config
+       -cp .config .config.test

        @$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
        @$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)

-
-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-clean:
-       @$(MAKE) -C $(CONFIG) clean
-
-distclean: clean
+       -./scripts/configtest.pl

 
 endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
        menuconfig tags check test depend
 
 
 endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
        menuconfig tags check test depend
 

-