[openap-cvs] : openap-main Makefile,1.12,1.13

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/openap-main
In directory subversions:/tmp/cvs-serv21374

Modified Files:
        Makefile 
Log Message:
- add license
- add DESTDIR (we'll be changing IMAGE_DIR to DESTDIR eventually)
- install_subdirs -> install
- no more verbose mklibs
- *config.mk's included at the end of the makefile so they can override
  definitions above.


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/openap-main/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile    31 Jul 2002 21:46:03 -0000      1.12
+++ Makefile    1 Aug 2002 20:14:20 -0000       1.13
@@ -1,7 +1,11 @@
-# Toplevel Makefile for OpenAP kernel linux kernel and filesystem
+# Toplevel Makefile for OpenAP
 #
 # Copyright (C) 2001-2002 Instant802 Networks Inc.
 #
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
+#
 
 # Set this to your target board.
 TARGET=wl11000
@@ -30,6 +34,7 @@
 TOPDIR         := $(shell pwd)
 STAMPDIR       =  $(TOPDIR)
 IMAGE_DIR      =  $(TOPDIR)/Image_final
+DESTDIR                =  $(IMAGE_DIR)
 TARGET_CONFIG  =  $(TOPDIR)/config/$(TARGET)/config.in
 
 
@@ -73,12 +78,12 @@
 BUILD_HOST      = $(shell $(TOPDIR)/config/config.guess)
 
 include make/rules.mk
-include config/$(TARGET)/config.mk
 
 
 export HOSTCC OPENAP_VERSION TOPDIR CONFIG_SITE PATH TOOL_PREFIX TARGET_PATH \
        CONFIG_TARGET ARCH TARGET CC LD AR STRIP BUILD_HOST BUILD_CC \
-       TARGET_CC STRIPFLAGS KERNEL_DIR MAKEFLAGS OBJCOPY CROSS_COMPILE
+       TARGET_CC STRIPFLAGS KERNEL_DIR MAKEFLAGS OBJCOPY CROSS_COMPILE \
+       DESTDIR INSTALL
 
 bootstrap: tools configure config_pcmcia kernel
 
@@ -102,8 +107,6 @@
        env
        $(CONFIG_SHELL)
 
-
-
 PCMCIA_OPTS=--kernel=$(KERNEL_DIR) --target=$(IMAGE_DIR) --trust --nocardbus \
        --nopnp --noapm --ld=$(LD) --ucc=$(CC) --kcc=$(CC) --srctree
 
@@ -148,7 +151,7 @@
        rm -rf `find $(IMAGE_DIR)/* -name CVS_placeholder`
        chmod +x $(IMAGE_DIR)/etc/init.d/*
 
-image: clean_image install_static subdirs install_subdirs
+image: clean_image install_static subdirs install
 
        mkdir -p $(IMAGE_DIR)/dev/
        $(MKNOD) $(IMAGE_DIR)/dev/console c 5 1
@@ -241,10 +244,10 @@
        $(INSTALL) -d  $(IMAGE_DIR)/lib
 ifneq ($(FLAVOR),native)
 # This is a hack since mklibs doesn't notice it needs to include the dynamic
-# linker.  I think it is uClibc's fault, btw.
+# linker.
        cp  $(CONFIG_PREFIX)/$(CONFIG_TARGET)/lib/ld-uClibc.so.0 
$(IMAGE_DIR)/lib/
 endif
-       scripts/mklibs -v $(MKLIBSFLAGS) \
+       scripts/mklibs $(MKLIBSFLAGS) \
            `find $(IMAGE_DIR) -type f -perm +0111`
 
 checkconfig:
@@ -262,8 +265,6 @@
        cp .config linux/
        cp config/autoconf.h linux/include/linux
 
-subdir-y :=
-
 subdir-$(CONFIG_UDHCP)                         += udhcp
 subdir-$(CONFIG_WIRELESS_TOOLS)        += wireless-tools
 subdir-$(CONFIG_ALIOS)                         += alios
@@ -283,15 +284,16 @@
                fi \
        done
 
-install_subdirs: subdirs
+install: subdirs
        for dir in $(SUBDIRS) ; do \
                if ! $(MAKE) -C $$dir install \
-                       INSTALL=install \
                        IMAGE_DIR=$(IMAGE_DIR) ; then \
                    exit 1 ; \
                fi \
        done
 
+include config/$(TARGET)/config.mk
+
 clean: clean_image
        for dir in $(SUBDIRS) ; do \
                $(MAKE) -C $$dir clean; \
@@ -300,3 +302,4 @@
 
 .PHONY : $(SUBDIRS) flash
 
+-include config/$(TARGET)/$(FLAVOR)config.mk