X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=openwrt%2FMakefile;h=1b8d968a0995a291cdb0fd549542daf81c5c5ff7;hb=a03d24a7c4da171b85f53b203b0898006b964f63;hp=dfa272120bb2a02061c30ae82f7cfdd38792ada1;hpb=2d53827a9a30c3ee64a095b5935e16567961cef5;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/openwrt/Makefile b/openwrt/Makefile
index dfa272120b..1b8d968a09 100644
--- a/openwrt/Makefile
+++ b/openwrt/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
@@ -21,8 +22,13 @@
 # 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
+endif
 CONFIG_DEFCONFIG = .defconfig
 CONFIG = package/config
 
@@ -31,28 +37,35 @@ noconfig_targets := menuconfig config oldconfig randconfig \
 
 # 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)
+include $(TOPDIR)/rules.mk
 
-#############################################################
+all: world
+
+.NOTPARALLEL:
+
+##############################################################
+#
+# Build the toolchain
+#
+##############################################################
+toolchain_install:
+	$(MAKE) -C toolchain install
+
+##############################################################
 #
-# The list of stuff to build for the target toolchain
-# along with the packages to build for the target.
+# Make all packages
 #
 ##############################################################
-TARGETS:=host-sed kernel-headers uclibc-configured binutils gcc uclibc-target-utils
-TARGETS+=openwrt-sstrip linux
 
-include toolchain/Makefile.in
-include package/Makefile.in
+package_compile: target_compile
+	$(MAKE) -C package compile
+
+package_install: package_compile toolchain
+	$(MAKE) -C package install
 
 #############################################################
 #
@@ -61,92 +74,80 @@ include package/Makefile.in
 #
 #############################################################
 
-
-
-all:   world
-
 # In this section, we need .config
 include .config.cmd
 
-# We also need the various per-package makefiles, which also add
-# each selected package to TARGETS if that package was selected
-# in the .config file.
-include toolchain/*/*.mk
-include package/*/*.mk
-include target/*/*.mk
+world: $(DL_DIR) $(BUILD_DIR) configtest target_prepare $(TARGET_DIR) toolchain_install package_install target_install package_index
 
-# target stuff is last so it can override anything else
-include target/Makefile.in
+.PHONY: all world clean dirclean distclean image_clean target_clean source target_prepare target_install toolchain_install package_install configtest
 
-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
-TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
+configtest:
+	-cp .config .config.test
+	-scripts/configtest.pl
 
-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+package_index:
+	(cd $(PACKAGE_DIR); \
+		$(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \
+	)
 
-.PHONY: all world clean dirclean distclean source $(TARGETS) \
-	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-	$(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
+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)
 
-$(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):
-	if [ -f "$(TARGET_SKELETON)" ] ; then \
-		zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
-	fi;
-	if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
-		cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
-	fi;
-	-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-	-find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
-
 source: $(TARGETS_SOURCE)
 
+
+package/%:
+	$(MAKE) -C package $(patsubst package/%,%,$@)
+
+target/%:
+	$(MAKE) -C target $(patsubst target/%,%,$@)
+
+toolchain/%:
+	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
+
 #############################################################
 #
 # Cleanup and misc junk
 #
 #############################################################
-clean: 
-	rm -rf $(TARGET_DIR) $(IMAGE).*
-	$(MAKE) openwrt-image-clean
+image_clean:
+	rm -f $(STAMP_DIR)/.*-compile
+	rm -f $(STAMP_DIR)/.*-install
+	rm -rf $(BIN_DIR)
+	
+target_clean: image_clean
+	rm -rf $(TARGET_DIR)
+	rm -rf $(BUILD_DIR)/linux-*/root
+
+clean: target_clean
+	@$(MAKE) -C $(CONFIG) clean
 
-dirclean: $(TARGETS_DIRCLEAN)
-	rm -rf $(TARGET_DIR) $(IMAGE).*
-	$(MAKE) openwrt-image-dirclean
+dirclean: clean
+	rm -rf $(BUILD_DIR)
 
 distclean: clean
-	rm -rf $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) 
-	rm .config* .tmpconfig.h
+	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; \
 
-
 else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 all: menuconfig
@@ -160,7 +161,7 @@ $(CONFIG)/conf:
 		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
@@ -209,16 +210,6 @@ defconfig: $(CONFIG)/conf
 	@$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
 	-./scripts/configtest.pl
 
-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-clean:
-	@$(MAKE) -C $(CONFIG) clean
-
-distclean: clean
-
 endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \