slp/linux-wlan-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

-pre8

Browse source 
And.. enema of the Makefiles.  Configure cares about cross-compiling,
the rest of everything uses the stuff that Configure tells it to.
This commit is contained in:
solomon 2002-09-11 18:08:32 +00:00
parent 1ef67e04dc
commit fb3d1bfee1
16 changed files with 48 additions and 367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -41,6 +41,8 @@
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
- Further cleanups of the build system (Makefiles)
-pre7
- Include wireless.h so wireless extensions work again. :)
- Work around the braindead RedHat kernel build system.
- Fix a class of unaligned accesses in the message structures

52
Configure
View file

@ -495,6 +495,7 @@ $ECHO ""
$ECHO ""
ask_str "Prefix for build host compiler? (rarely needed)" HOST_COMPILE
dump_str "HOST_CFLAGS=$HOST_CFLAGS"
$ECHO ""
@ -510,34 +511,41 @@ dump_str 'HOST_OBJDUMP=$(HOST_COMPILE)objdump'
dump_str 'HOST_RANLIB=$(HOST_COMPILE)ranlib'
dump_str 'HOST_MAKE=make'
if [ "$CROSS_COMPILE_ENABLED" != "n" -a "$CROSS_COMPILE_ENABLED" != "y" ] ; then
CROSS_COMPILE_ENABLED=n
CROSS_COMPILE_ENABLED=y
if [ "_$CROSS_COMPILE" = "_" ] ; then
CROSS_COMPILE_ENABLED=n
fi
ask_bool "Compiling with a cross compiler?" CROSS_COMPILE_ENABLED
write_str CROSS_COMPILE
write_bool CROSS_COMPILE_ENABLED
dump_str 'CFLAGS=-O2 -Wall -Wstrict-prototypes -pipe'
$ECHO ""
if [ "$CROSS_COMPILE_ENABLED" = "y" ] ; then
ask_str "Prefix for cross compiler? (change if cross-compiling)" CROSS_COMPILE
$ECHO ""
if [ "_$CROSS_COMPILE" = "_" ] ; then
dump_str 'AS=$(HOST_COMPILE)as'
dump_str 'LD=$(HOST_COMPILE)ld'
dump_str 'CC=$(HOST_COMPILE)gcc'
dump_str 'CPP=$(HOST_CC) -E'
dump_str 'AR=$(HOST_COMPILE)ar'
dump_str 'NM=$(HOST_COMPILE)nm'
dump_str 'STRIP=$(HOST_COMPILE)strip'
dump_str 'OBJCOPY=$(HOST_COMPILE)objcopy'
dump_str 'OBJDUMP=$(HOST_COMPILE)objdump'
dump_str 'RANLIB=$(HOST_COMPILE)ranlib'
dump_str 'MAKE=make'
else
CROSS_COMPILE=""
write_str CROSS_COMPILE
dump_str 'AS=$(CROSS_COMPILE)as'
dump_str 'LD=$(CROSS_COMPILE)ld'
dump_str 'CC=$(CROSS_COMPILE)gcc'
dump_str 'CPP=$(CROSS_CC) -E'
dump_str 'AR=$(CROSS_COMPILE)ar'
dump_str 'NM=$(CROSS_COMPILE)nm'
dump_str 'STRIP=$(CROSS_COMPILE)strip'
dump_str 'OBJCOPY=$(CROSS_COMPILE)objcopy'
dump_str 'OBJDUMP=$(CROSS_COMPILE)objdump'
dump_str 'RANLIB=$(CROSS_COMPILE)ranlib'
dump_str 'MAKE=make'
fi
dump_str 'CROSS_AS=$(CROSS_COMPILE)as'
dump_str 'CROSS_LD=$(CROSS_COMPILE)ld'
dump_str 'CROSS_CC=$(CROSS_COMPILE)gcc'
dump_str 'CROSS_CPP=$(CROSS_CC) -E'
dump_str 'CROSS_AR=$(CROSS_COMPILE)ar'
dump_str 'CROSS_NM=$(CROSS_COMPILE)nm'
dump_str 'CROSS_STRIP=$(CROSS_COMPILE)strip'
dump_str 'CROSS_OBJCOPY=$(CROSS_COMPILE)objcopy'
dump_str 'CROSS_OBJDUMP=$(CROSS_COMPILE)objdump'
dump_str 'CROSS_RANLIB=$(CROSS_COMPILE)ranlib'
dump_str 'CROSS_MAKE=make'
#=======================================================================
# Should we build for debugging?

2
config.in
View file

@ -1,7 +1,7 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=1
WLAN_SUBLEVEL=15
WLAN_EXTRAVERSION=-pre7
WLAN_EXTRAVERSION=-pre8
LINUX_SRC=/usr/src/linux
PCMCIA_SRC=
PREFIX=

4
scripts/Makefile.get_options
View file

@ -6,6 +6,8 @@ include Makefile
get_version_target:
echo "KERNEL_RELEASE=$(KERNEL_VERSION)" >> $(CURR_DIR)/make.opts
echo "KERNEL_CFLAGS='$(CFLAGS)'" >> $(CURR_DIR)/make.opts
# echo "KERNEL_CC='$(CC)'" >> $(CURR_DIR)/make.opts
echo "CROSS_COMPILE='$(CROSS_COMPILE)'" >> $(CURR_DIR)/make.opts
echo "KERNEL_MODFLAGS='$(MODFLAGS)'" >> $(CURR_DIR)/make.opts
echo "HOST_CC='$(HOSTCC)'" >> $(CURR_DIR)/make.opts
echo "HOST_CFLAGS='$(HOSTCFLAGS)'" >> $(CURR_DIR)/make.opts

34
src/mkmeta/Makefile
View file

@ -44,34 +44,17 @@
include ../../config.mk
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
CPPFLAGS= -I../include -I$(LINUX_SRC)/include \
-D__LINUX_WLAN__
# Implicit rules to handle the separate obj dirs
OBJ_DIR=obj
$(OBJ_DIR)/%.o : ../shared/%.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
$(HOST_CC) -c $(HOST_CFLAGS) $(CPPFLAGS) $< -o $@
$(OBJ_DIR)/%.o : %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
# Compiler Options
ifndef CFLAGS
CFLAGS = -g -O2 -Wall -Wstrict-prototypes -pipe
endif
CPPFLAGS= -I../include -I$(LINUX_SRC)/include \
-D__LINUX_WLAN__
$(HOST_CC) -c $(HOST_CFLAGS) $(CPPFLAGS) $< -o $@
# Source and obj and target definitions
SHSRC= ../shared/p80211types.c \
@ -99,7 +82,7 @@ DEP_SRC=$(MKMETADEF_SRC) $(MKMETASTRUCT_SRC)
all : .depend dirs mkmetadef mkmetastruct
dep .depend: $(DEP_SRC) ../../config.mk
$(CPP) -M $(CPPFLAGS) $(DEP_SRC) > .depend
$(HOST_CPP) -M $(CPPFLAGS) $(DEP_SRC) > .depend
dirs :
mkdir -p $(OBJ_DIR)
@ -107,13 +90,13 @@ dirs :
mkmetadef: $(MKMETADEF_OBJ) mkmetadefhead.txt
$(CC) -o $@ $(MKMETADEF_OBJ)
$(HOST_CC) -o $@ $(MKMETADEF_OBJ)
cat mkmetadefhead.txt > ../include/wlan/p80211metadef.h
./mkmetadef >> ../include/wlan/p80211metadef.h
echo "#endif" >> ../include/wlan/p80211metadef.h
mkmetastruct: $(MKMETASTRUCT_OBJ) mkmetastructhead.txt
$(CC) -o $@ $(MKMETASTRUCT_OBJ)
$(HOST_CC) -o $@ $(MKMETASTRUCT_OBJ)
cat mkmetastructhead.txt > ../include/wlan/p80211metastruct.h
./mkmetastruct >> ../include/wlan/p80211metastruct.h
echo "#endif" >> ../include/wlan/p80211metastruct.h
@ -123,11 +106,12 @@ install:
clean:
rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
rm -f ../shared/*.o
rm -fr $(OBJ_DIR)
rm -f mkmetadef mkmetastruct
rm -f ../include/wlan/p80211metastruct.h
rm -f ../include/wlan/p80211metadef.h
#
# Include a dependency file (if one exists)
#

30
src/nwepgen/Makefile
View file

@ -44,36 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =makep
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
ifndef CFLAGS
CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe
endif
CPPFLAGS= -I../include -I$(LINUX_SRC)/include \
-D__LINUX_WLAN__

26
src/p80211/Makefile
View file

@ -44,32 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
MAKE =make
endif
# -E outputs preprocessed, just noted here because I forget
# Build options (just comment out the ones you don't want)
ifeq ($(WLAN_DEBUG), y)
WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG

26
src/prism2/Makefile
View file

@ -44,32 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
DIRS=driver ridlist
# AVS.begin

31
src/prism2/download/Makefile
View file

@ -46,37 +46,6 @@
include ../../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
ifndef CFLAGS
CFLAGS = -g -O2 -Wall -Wstrict-prototypes -pipe
endif
# this will probably generate an error. New arch's need to be added explicitly
CPPFLAGS= -I../../include -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__
SRCS = prism2dl.c

28
src/prism2/driver/Makefile
View file

@ -44,34 +44,6 @@
include ../../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
# -E outputs preprocessed, just noted here because I forget
# Build options (just comment out the ones you don't want)
ifeq ($(WLAN_DEBUG), y)
WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG

31
src/prism2/ridlist/Makefile
View file

@ -44,32 +44,6 @@
include ../../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
# Implicit rules to handle the separate obj dirs
OBJ_DIR=obj
@ -79,11 +53,6 @@ $(OBJ_DIR)/%.o : ../../shared/%.c
$(OBJ_DIR)/%.o : %.c
$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
# Compiler Options
ifndef CFLAGS
CFLAGS = -g -O2 -Wall -Wstrict-prototypes -pipe
endif
# Preprocessor Options
CPPFLAGS= -I../../include -I$(LINUX_SRC)/include \
-D__LINUX_WLAN__ -D__I386__

27
src/shared/Makefile
View file

@ -44,32 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
all:
@echo "Nothing to do..."
@ -79,4 +53,3 @@ 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

32
src/skeleton/Makefile
View file

@ -44,39 +44,13 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
# -E outputs preprocessed, just noted here because I forget
# Build options (just comment out the ones you don't want)
ifeq ($(WLAN_DEBUG), y)
WLAN_INCLUDE_DEBUG="-DWLAN_INCLUDE_DEBUG"
endif
# XXXXXX this is COMPLETELY out of date.
# Source and obj and target definitions
SKEL_MODULE=skelwlan_cs.o
SKEL_SRC= skeleton.c
@ -145,7 +119,7 @@ clean:
rm -f core core.* *.o .*.o *.s *.a tmp_make *~ tags
rm -fr $(OBJ_DIR)
rm -fr $(MODULES)
#
# Include a dependency file (if one exists)
#

30
src/wlancfg/Makefile
View file

@ -44,36 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =makep
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
ifndef CFLAGS
CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe
endif
CPPFLAGS= -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__
SRCS = ../shared/p80211types.c \

30
src/wlanctl/Makefile
View file

@ -44,36 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
ifndef CFLAGS
CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe
endif
CPPFLAGS= -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__
SRCS = wlanctl.c \

30
src/wland/Makefile
View file

@ -44,36 +44,6 @@
include ../../config.mk
ifeq ($(CROSS_COMPILE_ENABLED), y)
AS =$(CROSS_AS)
LD =$(CROSS_LD)
CC =$(CROSS_CC)
CPP =$(CROSS_CPP)
AR =$(CROSS_AR)
NM =$(CROSS_NM)
STRIP =$(CROSS_STRIP)
OBJCOPY =$(CROSS_OBJCOPY)
OBJDUMP =$(CROSS_OBJDUMP)
RANLIB =$(CROSS_RANLIB)
MAKE =make
else
AS =$(HOST_AS)
LD =$(HOST_LD)
CC =$(HOST_CC)
CPP =$(HOST_CPP)
AR =$(HOST_AR)
NM =$(HOST_NM)
STRIP =$(HOST_STRIP)
OBJCOPY =$(HOST_OBJCOPY)
OBJDUMP =$(HOST_OBJDUMP)
RANLIB =$(HOST_RANLIB)
MAKE =make
endif
ifndef CFLAGS
CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe
endif
CPPFLAGS= -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__
SRCS = wland.c \