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

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/wl11000
In directory subversions:/tmp/cvs-serv28508

Modified Files:
        Makefile 
Log Message:
Makefile: export TOPDIR so subdirs can access things like pcmcia-cs/ and 
linux/.  Remove install target since we are now building uclibc differently.
prism2 allows us to build in the prism2 subdir now, now need for symlinks into
the pcmcia-cs subdir.  Force oldconfig and dep when building kernel. prism2
subdir is now a configuration option.


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/wl11000/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile    15 Jul 2002 20:37:35 -0000      1.6
+++ Makefile    16 Jul 2002 23:37:23 -0000      1.7
@@ -71,7 +71,7 @@
 
 HOSTCC = gcc
 
-export HOSTCC OPENAP_VERSION
+export HOSTCC OPENAP_VERSION TOPDIR
 
 #
 # When creating an sram image you must specify the size of the card (in 
megabytes).
@@ -93,13 +93,6 @@
 cramfs:
        $(MAKE) CC=gcc -C $(KERNEL_DIR)/scripts/cramfs/
 
-install:        
-       if ! $(MAKE) -C uclibc PREFIX=/ install ; then \
-               echo ; \
-               echo "Are you root?" ; \
-               echo ; \
-       fi
-
 bootstrap: config kernel flash
 
 config: config_kernel config_pcmcia
@@ -133,9 +126,8 @@
 
 
 PCMCIA_DIR   := $(TOPDIR)/pcmcia-cs
-PRISM_DIR    := $(TOPDIR)/prism2
 config_pcmcia:
-       if [ ! -L $(PCMCIA_DIR)/PCMCIA-HOWTO ] ; then \
+       @if [ ! -L $(PCMCIA_DIR)/PCMCIA-HOWTO ] ; then \
                ln -s doc/PCMCIA-HOWTO $(PCMCIA_DIR)/PCMCIA-HOWTO ; \
                ln -s ../pcmcia/config.h $(PCMCIA_DIR)/include/linux/compile.h 
; \
                ln -s ../pcmcia/config.h $(PCMCIA_DIR)/include/linux/config.h ; 
\
@@ -143,9 +135,6 @@
                ln -s ../asm $(PCMCIA_DIR)/include/static/asm ; \
                ln -s ../linux $(PCMCIA_DIR)/include/static/linux ; \
                ln -s ../../pcmcia/ciscode.h 
$(PCMCIA_DIR)/include/static/pcmcia/ciscode.h ; \
-               ln -s $(PRISM_DIR)/*.mk $(PCMCIA_DIR)/ 1>/dev/null 2>/dev/null 
; \
-               ln -s $(PRISM_DIR)/modules/prism*.[ch] \
-                       $(PCMCIA_DIR)/modules/ 1>/dev/null 2>/dev/null ; \
        fi
 
        cd $(PCMCIA_DIR) ; \
@@ -164,6 +153,8 @@
        fi
 
 kernel:
+       $(MAKE) -C linux oldconfig
+       $(MAKE) -C linux dep
        $(MAKE) -C linux bzImage ROOT_DEV="31 0"
 
 
@@ -283,6 +274,7 @@
 subdir-$(CONFIG_BUSYBOX)               += busybox
 subdir-$(CONFIG_ERASE)                 += erase
 subdir-$(CONFIG_IPTABLES)              += iptables
+subdir-$(CONFIG_PRISM2)                        += prism2
 
 SUBDIRS= $(subdir-y)