[openap-cvs] : openap-main Makefile,1.3,1.4

[David Kimdon <address@hidden>]

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

Modified Files:
        Makefile 
Log Message:
 - use cross-config.linux now, this gives autoconf more hints
 - set TARGET_CC, BUILD_CC and BUILD_HOST
 - don't override PATH anymore.  That was difficult to get right.  You will
 have to now set your PATH to include the cross-compiler.
 - don't for pcmcia reconfiguration on every build


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/openap-main/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile    19 Jul 2002 00:58:05 -0000      1.3
+++ Makefile    26 Jul 2002 20:44:01 -0000      1.4
@@ -40,9 +40,10 @@
 CONFIG_PREFIX  := $(shell echo $(CONFIG_PREFIX))
 CONFIG_TARGET  := $(shell echo $(CONFIG_TARGET))
 TARGET_PATH    =  $(CONFIG_PREFIX)/$(CONFIG_TARGET)
-CONFIG_SITE    := $(TOPDIR)/$(shell echo $(CONFIG_SITE))
+CONFIG_SITE    := $(TOPDIR)/config/cross-config.linux
 ARCH           =  $(shell echo $(CONFIG_TARGET) | sed -e 's/-.*//')
 CC             =  $(CONFIG_TARGET)-gcc
+TARGET_CC      =  $(CONFIG_TARGET)-gcc
 LD             =  $(CONFIG_TARGET)-ld
 AR             =  $(CONFIG_TARGET)-ar
 STRIP          =  $(CONFIG_TARGET)-strip
@@ -50,20 +51,16 @@
 INSTALL                =  /usr/bin/install
 STRIPFLAGS     =  "--remove-section=.comment --remove-section=.note"
 CFLAGS         =  -Wall -Wstrict-prototypes
-HOSTCC         ="/usr/bin/gcc -B/usr/bin/"
+HOSTCC         =  /usr/bin/gcc
+BUILD_CC       =  $(HOSTCC)
+BUILD_HOST      := $(shell $(TOPDIR)/config/config.guess)
 
 include make/rules.mk
 include config/$(TARGET)/config.mk
 
-# If we are building the toolchain we don't need or want to change the path.
-ifneq ($(MAKECMDGOALS),tools)
-ifneq ($(MAKECMDGOALS),bootstrap)
-PATH:=$(CONFIG_PREFIX)/$(CONFIG_TARGET)/$(ARCH)-linux/bin:$(CONFIG_PREFIX)/$(CONFIG_TARGET)/bin:$(PATH)
-endif
-endif
 
-export HOSTCC OPENAP_VERSION TOPDIR CONFIG_SITE PATH TOOL_PREFIX TARGET_PATH 
ARCH \
-  TARGET
+export HOSTCC OPENAP_VERSION TOPDIR CONFIG_SITE PATH TOOL_PREFIX TARGET_PATH \
+       ARCH TARGET CC LD AR STRIP BUILD_HOST BUILD_CC TARGET_CC
 
 bootstrap: tools configure kernel flash
 
@@ -197,7 +194,7 @@
 clean_image:
        rm -rf $(IMAGE_DIR)/*
        mkdir -p $(IMAGE_DIR)
-       
+
 flash: image reduce
        echo "`date "+%Y%m%d.%T"` `whoami` `hostname` " \
                > $(IMAGE_DIR)/etc/i802_version
@@ -246,7 +243,7 @@
 
 SUBDIRS= $(subdir-y)
 
-subdirs: config_pcmcia
+subdirs: 
        for dir in $(SUBDIRS) ; do \
                if ! $(MAKE) -C $$dir \
                        KERNEL_DIR=$(KERNEL_DIR) \