[openap-cvs] : wl11000 Makefile,1.2,1.3

[David Kimdon <address@hidden>]

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

Modified Files:
        Makefile 
Log Message:
first stab at a configurable system, you can choose which subdirs get built, 
also choose whether the AP is configured as a bridge, or a router.


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/wl11000/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile    13 May 2002 17:36:36 -0000      1.2
+++ Makefile    20 May 2002 00:47:28 -0000      1.3
@@ -24,7 +24,35 @@
 # The first step to getting Linux running on your AP is to boot off an SRAM 
 # card, details in the html documentation.  The sram target creates this image.
 #
-#
+# targets - 
+#   tools     : build uclibc and assorted tools
+#   install   : install uclibc toolchain (must be root)
+#   bootstrap : configure and build kernel, then flash
+#   sram      : make sram image
+
+
+# Notes for developers: 
+# I'm gradually making this distribution configurable, you can help.  If you
+# want to add something that will take up either flash or RAM at runtime please
+# consider for a moment whether or not _everyone_ will want it.  If not 
everyone
+# will want it, please make it configurable.
+# 
+
+all: do-it-all
+
+ifeq (.config,$(wildcard .config))
+include .config
+do-it-all:     flash
+else
+do-it-all:     menuconfig
+endif
+
+CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+         else if [ -x /bin/bash ]; then echo /bin/bash; \
+         else echo sh; fi ; fi)
+
+ARCH := i386
+OPENAP_VERSION = 0.1.2-pre
 
 TOPDIR      := $(shell pwd)
 KERNEL_DIR      := $(TOPDIR)/linux
@@ -41,6 +69,9 @@
 STRIPFLAGS="--remove-section=.comment --remove-section=.note"
 CFLAGS       =-Wall -Wstrict-prototypes
 
+HOSTCC = gcc
+
+export HOSTCC OPENAP_VERSION
 
 #
 # When creating an sram image you must specify the size of the cardi (in 
megabytes).
@@ -48,22 +79,12 @@
 
 SRAM_SIZE=2
 
-default:
-       @echo
-       @echo "Makefile for OpenAP tools, kernel and flash image."
-       @echo
-       @echo "targets - "
-       @echo "  tools     : build uclibc and assorted tools"
-       @echo "  install   : install uclibc toolchain (must be root)"
-       @echo "  bootstrap : configure and build kernel, then flash"
-       @echo "  sram      : make sram image"
-       @echo
-       @echo "Please see Makefile for details."
-       @echo
 
-tools: check config_kernel
+tools: check config_kernel cramfs
        $(MAKE) -C uclibc KERNEL_SOURCE=$(KERNEL_DIR)
        $(MAKE) -C misc
+
+cramfs:
        $(MAKE) CC=gcc -C $(KERNEL_DIR)/scripts/cramfs/
 
 install:        
@@ -78,7 +99,7 @@
 config: config_kernel config_pcmcia
 
 config_kernel:
-       cp misc/kernel_config $(KERNEL_DIR)/.config
+#      cp misc/kernel_config $(KERNEL_DIR)/.config
        $(MAKE) -C $(KERNEL_DIR) oldconfig
        $(MAKE) -C $(KERNEL_DIR) dep
 
@@ -148,10 +169,11 @@
        chmod +x $(IMAGE_DIR)/etc/init.d/*
 
 UCLIBC_VER=0.9.11
-LIBS=ld-uClibc.so* libc.so* libresolv.so* \
+LIBS=ld-uClibc.so.0 libc.so.0 libresolv.so.0 libdl.so.0 \
        ld-uClibc-$(UCLIBC_VER).so \
        libuClibc-$(UCLIBC_VER).so \
        libresolv-$(UCLIBC_VER).so \
+       libdl-$(UCLIBC_VER).so
 
 image: clean_image install_static subdirs install_subdirs
 
@@ -205,17 +227,23 @@
 
        # init 1 - nothing running mode (upgrades)
        mkdir -p $(IMAGE_DIR)/etc/rc1.d
-       ln -s ../init.d/tcpip $(IMAGE_DIR)/etc/rc1.d/K50tcpip
+       mkdir -p $(IMAGE_DIR)/etc/rc3.d
+ifeq ($(CONFIG_AP_BRIDGE),y)
        ln -s ../init.d/bridge $(IMAGE_DIR)/etc/rc1.d/K60bridge
+       ln -s ../init.d/bridge $(IMAGE_DIR)/etc/rc3.d/S30bridge
+       ln -s ../init.d/tcpip.bridge $(IMAGE_DIR)/etc/rc3.d/S40tcpip
+       ln -s ../init.d/tcpip.bridge $(IMAGE_DIR)/etc/rc1.d/K50tcpip
+endif
+ifeq ($(CONFIG_AP_ROUTER),y)
+       ln -s ../init.d/tcpip.router $(IMAGE_DIR)/etc/rc3.d/S40tcpip
+       ln -s ../init.d/tcpip.router $(IMAGE_DIR)/etc/rc1.d/K50tcpip
+endif
        ln -s ../init.d/wireless $(IMAGE_DIR)/etc/rc1.d/K70wireless
        ln -s ../init.d/configfs $(IMAGE_DIR)/etc/rc1.d/K80configfs
 
        # init 3 - normal run mode
-       mkdir -p $(IMAGE_DIR)/etc/rc3.d
        ln -s ../init.d/configfs $(IMAGE_DIR)/etc/rc3.d/S10configfs
        ln -s ../init.d/wireless $(IMAGE_DIR)/etc/rc3.d/S20wireless
-       ln -s ../init.d/bridge $(IMAGE_DIR)/etc/rc3.d/S30bridge
-       ln -s ../init.d/tcpip $(IMAGE_DIR)/etc/rc3.d/S40tcpip
 
        ln -s /var/syslogd.socket $(IMAGE_DIR)/dev/log
        
@@ -237,7 +265,24 @@
 
 #####################################################################
 
-SUBDIRS=erase wireless-tools alios bridge-utils pcmcia-cs busybox misc udhcp
+foo menuconfig:
+       $(MAKE) -C scripts/lxdialog all
+       $(CONFIG_SHELL) scripts/Menuconfig config.in
+
+
+subdir-y :=
+
+subdir-$(CONFIG_UDHCP)                         += udhcp
+subdir-$(CONFIG_WIRELESS_TOOLS)        += wireless-tools
+subdir-$(CONFIG_ALIOS)                         += alios
+subdir-$(CONFIG_BRIDGE_UTILS)          += bridge-utils
+subdir-$(CONFIG_PCMCIA_CS)             += pcmcia-cs
+subdir-$(CONFIG_BUSYBOX)               += busybox
+subdir-$(CONFIG_MISC)                  += misc
+subdir-$(CONFIG_ERASE)                 += erase
+subdir-$(CONFIG_IPTABLES)              += iptables
+
+SUBDIRS= $(subdir-y)
 
 subdirs:
        for dir in $(SUBDIRS) ; do \