Fixed bugs in top-level Makefile.

Configure

@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# linux-wlan-ng/Configure
+#
 # Adapted from the pcmcia-cs/Configure file, license statement below:
 #
 # Configure 1.110 1999/06/24 17:37:36
@@ -18,7 +20,6 @@
 # <dhinds@hyper.stanford.edu>.  Portions created by David A. Hinds
 # are Copyright (C) 1998 David A. Hinds.  All Rights Reserved.
 #-------------------------------------------------------------------------
-# linux-wlan-ng/Configure
 #
 # TODO: Since we're dependent on configured pcmcia source, we should change 
 #       this such that it will ask for the pcmcia source dir and then read
@@ -34,9 +35,8 @@ fail ()
 	exit 1
 }
 
-
 if [ -r config.out ]; then
-	. ./config.out 2> /dev/null
+	. ./config.out 2>/dev/null
 else
 	if [ ! -r config.in ]; then
 		$ECHO "config.in does not exist!"
@@ -45,8 +45,15 @@ else
 	. ./config.in
 fi
 
-
 PROMPT=y
+if [ $# -gt 0 ] ; then
+	if [ "$1" = "-d" ] ; then 
+		PROMPT=n
+		if [ $# -gt 1 -a -r $2 ]; then
+			. ./$2
+		fi
+	fi
+fi
 
 arg () {
     VALUE="`$ECHO X"$2" | sed -e 's/^X--[a-zA-Z_]*=//'`"
@@ -54,7 +61,9 @@ arg () {
 }
 
 usage () {
-    $ECHO "usage: $0 "
+    echo "usage: Configure [-d <filename>]"
+    echo ""
+    echo "  -d <filename>       read configuration data from file"
     exit 1
 }
 
@@ -62,7 +71,7 @@ usage () {
 
 CONFIG=config.new
 CONFIG_MK=config.mk
-rm -f .prereq.ok $CONFIG $CONFIG_MK $MODVER
+rm -f $CONFIG $CONFIG_MK $MODVER
 
 cat << 'EOF' > $CONFIG
 #
@@ -238,10 +247,11 @@ write_str TARGET_INST_EXEDIR
 
 $ECHO ""
 
+SYSV_INIT=n
 if [ "$PREFIX" = "" ] ; then
     if [ -d /etc/rc.d/init.d -o -d /etc/init.d -o -d /sbin/init.d ] ; then
 	$ECHO "It looks like you have a System V init file setup."
-	SYSV_INIT=y
+	SYSV_INIT=n
 	if [ -d /etc/rc.d/init.d ] ; then
 	    $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG
 	    $ECHO "RC_DIR=/etc/rc.d" >> $CONFIG_MK
@@ -259,7 +269,7 @@ if [ "$PREFIX" = "" ] ; then
 		 "/etc/rc.d/rc.wlan (for ISA/PCMCIA cards)"
 	    $ECHO "    so that wlan cards will be started at boot time."
 	fi
-	SYSV_INIT=
+	SYSV_INIT=n
     fi
     write_bool SYSV_INIT
 else
@@ -276,7 +286,9 @@ $ECHO ""
 #=======================================================================
 # Make sure our target architecture is the same as our build architecture.
 
-WLAN_INSTALL_TYPE=sta
+if [ ! WLAN_INSTALL_TYPE ] ; then
+	WLAN_INSTALL_TYPE=sta
+fi
 ask_str "Install drivers as station (sta) or access point (ap)?" WLAN_INSTALL_TYPE
 
 #=======================================================================
@@ -326,10 +338,6 @@ ask_bool "Build for Kernel PCMCIA?" WLAN_KERN_PCMCIA
 
 mv $CONFIG config.out
 
-touch .prereq.ok
-
 $ECHO ""
 $ECHO "Configuration successful."
 $ECHO ""
-
-

Makefile

@@ -1,7 +1,9 @@
-# Makefile
+# linux-wlan Makefile
+#
+#  Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
 # --------------------------------------------------------------------
 #
-# Linux WLAN 
+# linux-wlan
 #
 #   The contents of this file are subject to the Mozilla Public
 #   License Version 1.1 (the "License"); you may not use this file
@@ -13,10 +15,6 @@
 #   implied. See the License for the specific language governing
 #   rights and limitations under the License.
 #
-#   The initial developer of the original code is Mark S. Mathews
-#   <mark@absoval.com>.  Portions created by Mark S. Mathews are 
-#   Copyright (C) 1999 AbsoluteValue Software, Inc.  All Rights Reserved.
-#
 #   Alternatively, the contents of this file may be used under the
 #   terms of the GNU Public License version 2 (the "GPL"), in which
 #   case the provisions of the GPL are applicable instead of the
@@ -30,10 +28,15 @@
 #
 # --------------------------------------------------------------------
 #
-# The initial author may be reached as mark@absoval.com, or 
-# C/O AbsoluteValue Software Inc., P.O. Box 941149, 
+# Inquiries regarding the linux-wlan Open Source project can be
+# made directly to:
+#
+# AbsoluteValue Systems Inc.
+# P.O. Box 941149
 # Maitland, FL, 32794-1149
 #
+# info@linux-wlan.com
+# http://www.linux-wlan.com
 # --------------------------------------------------------------------
 #
 # Portions of the development of this software were funded by 
@@ -46,6 +49,7 @@ DIRS = src doc man etc
 
 help:
 	@echo "Pick one of the following targets:"
+	@echo -e "\tmake default_config\t- configure using default config file"
 	@echo -e "\tmake config\t\t- configure and check system setup"
 	@echo -e "\tmake all\t\t- build modules and programs"
 	@echo -e "\tmake install\t\t- install modules and programs"
@@ -55,15 +59,20 @@ all:
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done
 
 clean:
-	touch config.mk
+	touch config.mk config.new
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
-	rm -f config.mk
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
+	rm -f config.mk config.new
 	
 install:
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done
 
+default_config:
+	@touch config.mk config.new
+	@rm -f config.mk config.new
+	@./Configure -d ../config.all
+
 config:
 	@touch config.mk
 	@./Configure

doc/Makefile

@@ -51,5 +51,5 @@ install:
 
 clean:
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	

man/Makefile

@@ -51,5 +51,5 @@ install:
 
 clean:
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	

src/Makefile

@@ -59,7 +59,7 @@ all:
 clean:
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	set -e; for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	set -e; for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	
 install:
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done

src/am930/Makefile

@@ -62,5 +62,5 @@ install:
 
 clean: 
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	

src/prism2/Makefile

@@ -66,7 +66,7 @@ all:
 clean:
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	
 install:
 	set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done

src/prism2/download/Makefile

@@ -87,5 +87,5 @@ install:
 clean: 
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
 	rm -f prism2dl
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	

src/prism2/driver/Makefile

@@ -150,11 +150,10 @@ else
 endif
 
 clean: 
-	touch .depend
+	rm -f .depend.sta_cs .depend.ap_cs
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
 	rm -fr $(STA_CS_OBJ_DIR) $(AP_CS_OBJ_DIR)
 	rm -fr $(MODULES)
-	rm -f .depend .depend.sta_cs .depend.ap_cs
 
 # This probably isn't the best way to handle the dependencies, but it works.
 

src/prism2/ridlist/Makefile

@@ -121,6 +121,7 @@ install:
 	echo "Nothing to do"
 
 clean:
+	rm -f .depend
 	rm -f core core.* *.o .*.o *.s *.a *.sort tmp_make *~ tags
 	rm -fr $(OBJ_DIR)
 	rm -f mkridlist

src/shared/Makefile

@@ -62,5 +62,5 @@ install:
 
 clean:
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	

src/skeleton/Makefile

@@ -121,11 +121,10 @@ install : $(MODULES)
 	cp $(SKEL_MODULE) $(TARGET_MODDIR)/pcmcia
 
 clean: 
-	touch .depend
+	rm -f .depend .depend*
 	rm -f core core.* *.o .*.o *.s *.a tmp_make *~ tags
 	rm -fr $(OBJ_DIR) 
 	rm -fr $(MODULES)
-	rm -f .depend
 	
 #
 # Include a dependency file (if one exists)

src/wlanctl/Makefile

@@ -101,5 +101,5 @@ install:
 clean: 
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
 	rm -f wlanctl
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
 	

src/wland/Makefile

@@ -99,6 +99,6 @@ install:
 clean: 
 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
 	rm -f wland
-	for i in *_obj; do if [ -d $i ]; then rm -fr $i; fi; done
+	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done