[openap-cvs] : openap-main Makefile,1.11,1.12

[David Kimdon <address@hidden>]

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

Modified Files:
        Makefile 
Log Message:
Makefile: - remove usage that is now handled in README
 - pass new --pic-glob switch to mklibs
 - include ugly hack since mklibs isn't picking up 
 - after oldconfig and menuconfig copy the generated files into the kernel's
   build directory.  This isn't an ideal solution but it will do for now.
 - set dynamic linker in for native build
scripts/mklibs: - properly make dynamic linker executable
 - add new option to specify glob for finding pic libs


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/openap-main/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile    30 Jul 2002 18:49:49 -0000      1.11
+++ Makefile    31 Jul 2002 21:46:03 -0000      1.12
@@ -2,9 +2,6 @@
 #
 # Copyright (C) 2001-2002 Instant802 Networks Inc.
 #
-# targets - 
-#   bootstrap : build assorted tools
-#
 
 # Set this to your target board.
 TARGET=wl11000
@@ -49,14 +46,14 @@
 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) --ldlib=ld-uClibc.so.0 
--pic-glob="*.a"
 PCMCIA_DIR     = $(TOPDIR)/pcmcia-cs
 else
 # FIXME: KERNEL_DIR,PCMCIA_DIR are configurable parameters they
 # need to move to a better place
-PCMCIA_DIR     = 
+PCMCIA_DIR     = $(TOPDIR)/pcmcia-cs
 KERNEL_DIR      =  /usr/src/linux
-MKLIBSFLAGS    = -L /usr/lib
+MKLIBSFLAGS    = --ldlib=ld-linux.so.2
 endif
 
 MKLIBSFLAGS    +=-d $(IMAGE_DIR)/lib
@@ -242,6 +239,11 @@
 # those symbols.
 reduce:
        $(INSTALL) -d  $(IMAGE_DIR)/lib
+ifneq ($(FLAVOR),native)
+# This is a hack since mklibs doesn't notice it needs to include the dynamic
+# linker.  I think it is uClibc's fault, btw.
+       cp  $(CONFIG_PREFIX)/$(CONFIG_TARGET)/lib/ld-uClibc.so.0 
$(IMAGE_DIR)/lib/
+endif
        scripts/mklibs -v $(MKLIBSFLAGS) \
            `find $(IMAGE_DIR) -type f -perm +0111`
 
@@ -252,9 +254,13 @@
 menuconfig: checkconfig
        $(MAKE) -C scripts/lxdialog all
        $(CONFIG_SHELL) scripts/Menuconfig $(TARGET_CONFIG)
+       cp .config linux/
+       cp config/autoconf.h linux/include/linux
 
 oldconfig: $(TOPDIR)/.config checkconfig
        $(CONFIG_SHELL) scripts/Configure -d $(TARGET_CONFIG)
+       cp .config linux/
+       cp config/autoconf.h linux/include/linux
 
 subdir-y :=