[openap-cvs] : openap-main Makefile,1.16,1.17

[David Kimdon <address@hidden>]

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

Modified Files:
        Makefile 
Log Message:
- move device creation out of this file, now that is done in the board specific
  area
- mklibs is fixed so it can now find the dynamic linker on its own
- Image_static isn't used anymore, we install everything from rootskel
- silence some rules a bit
- experimental way to pull in extra rules from facility subdirs.



Index: Makefile
===================================================================
RCS file: /cvsroot/openap/openap-main/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile    6 Aug 2002 01:22:15 -0000       1.16
+++ Makefile    8 Aug 2002 17:24:31 -0000       1.17
@@ -17,11 +17,13 @@
 # No need to change anything below this line unless you are
 # hacking on the build system.
 
+include make/config.mk
+
 all: do-it-all
 
 ifeq (.config,$(wildcard .config))
 include .config
-do-it-all:     flash
+do-it-all:     image
 else
 do-it-all:     menuconfig
 endif
@@ -52,7 +54,7 @@
 ARCH           =  $(shell echo $(CONFIG_TARGET) | sed -e 's/-.*//')
 CROSS_COMPILE  =  $(CONFIG_TARGET)-
 MKLIBSFLAGS    = --no-default-lib  -L $(CONFIG_PREFIX)/$(CONFIG_TARGET)/lib \
-               --target=$(CONFIG_TARGET) --ldlib=ld-uClibc.so.0
+               --target=$(CONFIG_TARGET)
 PCMCIA_DIR     = $(TOPDIR)/pcmcia-cs
 else
 # FIXME: KERNEL_DIR,PCMCIA_DIR are configurable parameters they
@@ -78,8 +80,6 @@
 BUILD_CC       =  $(HOSTCC)
 BUILD_HOST      = $(shell $(TOPDIR)/config/config.guess)
 
-include make/rules.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 \
@@ -145,90 +145,11 @@
 kernel:
        $(MAKE) -C linux bzImage ROOT_DEV=$(CONFIG_ROOT_DEV) HOSTCC=$(HOSTCC)
 
-install_static:
-       mkdir -p $(IMAGE_DIR)/
-       cp -a Image_static/* $(IMAGE_DIR)/
-       rm -rf `find $(IMAGE_DIR)/* -name *CVS*`
-       rm -rf `find $(IMAGE_DIR)/* -name CVS_placeholder`
-       chmod +x $(IMAGE_DIR)/etc/init.d/*
-
-image: clean_image install_static subdirs install
-
-       mkdir -p $(IMAGE_DIR)/dev/
-       $(MKNOD) $(IMAGE_DIR)/dev/console c 5 1
-       $(MKNOD) $(IMAGE_DIR)/dev/initctl p
-       $(MKNOD) $(IMAGE_DIR)/dev/kmem    c 1 2
-       $(MKNOD) $(IMAGE_DIR)/dev/loop0   b 7 0
-       $(MKNOD) $(IMAGE_DIR)/dev/loop1   b 7 1
-       $(MKNOD) $(IMAGE_DIR)/dev/mem     c 1 1
-       $(MKNOD) $(IMAGE_DIR)/dev/null    c 1 3
-       $(MKNOD) $(IMAGE_DIR)/dev/port    c 1 4
-       $(MKNOD) $(IMAGE_DIR)/dev/ptmx    c 5 2
-       ln -s    ram0                     $(IMAGE_DIR)/dev/ram
-       $(MKNOD) $(IMAGE_DIR)/dev/ram0    b 1 0
-       ln -s    ram0                     $(IMAGE_DIR)/dev/ramdisk 
-       $(MKNOD) $(IMAGE_DIR)/dev/random  c 1 8
-       ln -s    ../proc/self/fd/2        $(IMAGE_DIR)/dev/stderr 
-       ln -s    ../proc/self/fd/0        $(IMAGE_DIR)/dev/stdin
-       ln -s    ../proc/self/fd/1        $(IMAGE_DIR)/dev/stdout 
-       $(MKNOD) $(IMAGE_DIR)/dev/tty     c 5 0
-       $(MKNOD) $(IMAGE_DIR)/dev/tty0    c 4 0
-       $(MKNOD) $(IMAGE_DIR)/dev/ttyS0   c 4 64
-       $(MKNOD) $(IMAGE_DIR)/dev/urandom c 1 9
-       $(MKNOD) $(IMAGE_DIR)/dev/zero    c 1 5
-       $(MKNOD) $(IMAGE_DIR)/dev/watchdog c 10 130
-
-       $(MKNOD) $(IMAGE_DIR)/dev/mtd0 c 90 0
-       $(MKNOD) $(IMAGE_DIR)/dev/mtdblock0 b 31 0
-
-       # tty/pty's used by telnetd
-       let i=0; \
-       while [ $$i -lt 4 ] ; do\
-               $(MKNOD) $(IMAGE_DIR)/dev/ptyp$$i c 2 $$i ;\
-               $(MKNOD) $(IMAGE_DIR)/dev/ttyp$$i c 3 $$i ;\
-               let i=$$i+1;\
-       done
-
-       address@hidden a+r $(IMAGE_DIR)/dev 1>/dev/null 2>/dev/null
-
-       # set a link from /etc/mtab to /proc/mtab
-       ln -s ../proc/mounts $(IMAGE_DIR)/etc/mtab
-
-       # link /tmp to /var/tmp so we don't have to mount another ramfs
-       ln -s /var/tmp $(IMAGE_DIR)/tmp
-       # link /etc/var to /var/etc/var so we don't have to mount another ramfs
-       ln -s /var/etc/rw  $(IMAGE_DIR)/etc/rw
-       ln -s /var/etc/rw/resolv.conf  $(IMAGE_DIR)/etc/resolv.conf
-
-       # set the runlevels
-
-       # init 1 - nothing running mode (upgrades)
-       mkdir -p $(IMAGE_DIR)/etc/rc1.d
-       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
-       ln -s ../init.d/configfs $(IMAGE_DIR)/etc/rc3.d/S10configfs
-       ln -s ../init.d/wireless $(IMAGE_DIR)/etc/rc3.d/S20wireless
-
-       ln -s /var/syslogd.socket $(IMAGE_DIR)/dev/log
-
 clean_image:
        rm -rf $(IMAGE_DIR)/*
        mkdir -p $(IMAGE_DIR)
 
-flash: image reduce
+image: install reduce
        echo "`date "+%Y%m%d.%T"` `whoami` `hostname` " \
                > $(IMAGE_DIR)/etc/i802_version
        rm -rf `find $(IMAGE_DIR)/* -name *CVS*`
@@ -266,6 +187,7 @@
        cp .config linux/
        cp config/autoconf.h linux/include/linux
 
+subdir-y                               += rootskel
 subdir-$(CONFIG_UDHCP)                         += udhcp
 subdir-$(CONFIG_WIRELESS_TOOLS)        += wireless-tools
 subdir-$(CONFIG_ALIOS)                         += alios
@@ -279,7 +201,7 @@
 SUBDIRS= $(subdir-y)
 
 install_tools:
-       for dir in $(SUBDIRS) ; do \
+       @for dir in $(SUBDIRS) ; do \
                if ! $(MAKE) -C $$dir -f facility/rules install_tools ; then \
                    exit 1; \
                fi \
@@ -287,7 +209,7 @@
 
 # build files for target
 subdirs: 
-       for dir in $(SUBDIRS) ; do \
+       @for dir in $(SUBDIRS) ; do \
                if ! $(MAKE) -C $$dir -f facility/rules build ; then \
                    exit 1; \
                fi \
@@ -295,7 +217,7 @@
 
 # install files into target directory
 install: subdirs
-       for dir in $(SUBDIRS) ; do \
+       @for dir in $(SUBDIRS) ; do \
                if ! $(MAKE) -C $$dir -f facility/rules install \
                        IMAGE_DIR=$(IMAGE_DIR) ; then \
                    exit 1 ; \
@@ -304,12 +226,13 @@
 
 
 clean: clean_image
-       for dir in $(SUBDIRS) ; do \
+       @for dir in $(SUBDIRS) ; do \
                $(MAKE) -C $$dir -f facility/rules clean ; \
        done
        $(RM) flash flash.md5 $(STAMPDIR)/.configure
 
-include config/$(TARGET)/config.mk
--include config/$(TARGET)/$(FLAVOR)config.mk
+include make/rules.mk
+
+-include $(addsuffix /facility/rules.mk,$(subdir-y)) 
 
-.PHONY : $(SUBDIRS) flash
+.PHONY : $(SUBDIRS) image