[openap-cvs] : openap-main Makefile,1.6,1.7

[David Kimdon <address@hidden>]

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

Modified Files:
        Makefile 
Log Message:
- set OBJCOPY tool variable
- export soem more vars
- configure_pcmcia -> config_pcmcia
- specify appropriate linker when doing pcmcia config
- don't need to pass variables on the command line to make now that they 
  are passed in the environment
- minor fix to clen target


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/openap-main/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile    29 Jul 2002 22:16:17 -0000      1.6
+++ Makefile    29 Jul 2002 23:54:32 -0000      1.7
@@ -47,11 +47,12 @@
 LD             =  $(CONFIG_TARGET)-ld
 AR             =  $(CONFIG_TARGET)-ar
 STRIP          =  $(CONFIG_TARGET)-strip
+OBJCOPY                =  $(CONFIG_TARGET)-objcopy
 MKNOD          =  /bin/mknod
 INSTALL                =  /usr/bin/install
 STRIPFLAGS     =  "--remove-section=.comment --remove-section=.note"
 CFLAGS         =  -Wall -Wstrict-prototypes
-HOSTCC         =  /usr/bin/gcc
+HOSTCC         =  gcc
 BUILD_CC       =  $(HOSTCC)
 BUILD_HOST      := $(shell $(TOPDIR)/config/config.guess)
 
@@ -60,11 +61,12 @@
 
 
 export HOSTCC OPENAP_VERSION TOPDIR CONFIG_SITE PATH TOOL_PREFIX TARGET_PATH \
-       ARCH TARGET CC LD AR STRIP BUILD_HOST BUILD_CC TARGET_CC
+       CONFIG_TARGET ARCH TARGET CC LD AR STRIP BUILD_HOST BUILD_CC \
+       TARGET_CC STRIPFLAGS KERNEL_DIR MAKEFLAGS OBJCOPY
 
 bootstrap: tools configure kernel
 
-configure: $(STAMPDIR)/.configure configure_pcmcia
+configure: $(STAMPDIR)/.configure config_pcmcia
 $(STAMPDIR)/.configure: $(KERNEL_DIR)/.config $(TOPDIR)/.config
        $(MAKE) -C $(KERNEL_DIR) oldconfig
        $(MAKE) -C $(KERNEL_DIR) dep HOSTCC=$(HOSTCC)
@@ -99,7 +101,7 @@
 
        cd $(PCMCIA_DIR) ; \
        $(PCMCIA_DIR)/Configure -n --kernel=$(KERNEL_DIR) \
-       --target=$(IMAGE_DIR) --ucc=$(CC) --kcc=$(CC) --trust \
+       --target=$(IMAGE_DIR) --ld=$(LD) --ucc=$(CC) --kcc=$(CC) --trust \
        --nocardbus --nopnp --noapm --srctree ;
 
 check:
@@ -113,7 +115,7 @@
        fi
 
 kernel:
-       $(MAKE) -C linux bzImage ROOT_DEV=$(CONFIG_ROOT_DEV) HOSTCC=$(HOSTCC)
+       $(MAKE) -C linux bzImage ROOT_DEV=$(CONFIG_ROOT_DEV) HOSTCC=$(HOSTCC) 
CROSS_COMPILE=$(CONFIG_TARGET)-
 
 install_static:
        mkdir -p $(IMAGE_DIR)/
@@ -248,10 +250,7 @@
 
 subdirs: 
        for dir in $(SUBDIRS) ; do \
-               if ! $(MAKE) -C $$dir \
-                       KERNEL_DIR=$(KERNEL_DIR) \
-                       CC=$(CC) \
-                       ; then \
+               if ! $(MAKE) -C $$dir ; then \
                    exit 1; \
                fi \
        done
@@ -260,9 +259,7 @@
        for dir in $(SUBDIRS) ; do \
                if ! $(MAKE) -C $$dir install \
                        INSTALL=install \
-                       IMAGE_DIR=$(IMAGE_DIR) \
-                       STRIP=$(STRIP) \
-                       STRIPFLAGS=$(STRIPFLAGS) ; then \
+                       IMAGE_DIR=$(IMAGE_DIR) ; then \
                    exit 1 ; \
                fi \
        done
@@ -271,8 +268,7 @@
        for dir in $(SUBDIRS) ; do \
                $(MAKE) -C $$dir clean; \
        done
-       $(RM) flash flash.md5
-       rm $(STAMP_DIR)/.configure $(STAMP_DIR)/.tools
+       $(RM) flash flash.md5 $(STAMPDIR)/.configure
 
 .PHONY : $(SUBDIRS) flash