From fb3d1bfee1099f8561fd411bf234124dd5962964 Mon Sep 17 00:00:00 2001 From: solomon Date: Wed, 11 Sep 2002 18:08:32 +0000 Subject: [PATCH] -pre8 And.. enema of the Makefiles. Configure cares about cross-compiling, the rest of everything uses the stuff that Configure tells it to. --- CHANGES | 2 ++ Configure | 52 +++++++++++++++++++++--------------- config.in | 2 +- scripts/Makefile.get_options | 4 ++- src/mkmeta/Makefile | 34 +++++++---------------- src/nwepgen/Makefile | 30 --------------------- src/p80211/Makefile | 26 ------------------ src/prism2/Makefile | 26 ------------------ src/prism2/download/Makefile | 31 --------------------- src/prism2/driver/Makefile | 28 ------------------- src/prism2/ridlist/Makefile | 31 --------------------- src/shared/Makefile | 27 ------------------- src/skeleton/Makefile | 32 +++------------------- src/wlancfg/Makefile | 30 --------------------- src/wlanctl/Makefile | 30 --------------------- src/wland/Makefile | 30 --------------------- 16 files changed, 48 insertions(+), 367 deletions(-) diff --git a/CHANGES b/CHANGES index a1f0b88..786f056 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/Configure b/Configure index 8436c22..bbf67ff 100755 --- a/Configure +++ b/Configure @@ -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? diff --git a/config.in b/config.in index e1dc971..b18f53d 100644 --- a/config.in +++ b/config.in @@ -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= diff --git a/scripts/Makefile.get_options b/scripts/Makefile.get_options index 88ef84a..febbc35 100644 --- a/scripts/Makefile.get_options +++ b/scripts/Makefile.get_options @@ -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 diff --git a/src/mkmeta/Makefile b/src/mkmeta/Makefile index 661cf7b..543763f 100644 --- a/src/mkmeta/Makefile +++ b/src/mkmeta/Makefile @@ -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) # diff --git a/src/nwepgen/Makefile b/src/nwepgen/Makefile index 62a85ce..e62fe06 100644 --- a/src/nwepgen/Makefile +++ b/src/nwepgen/Makefile @@ -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__ diff --git a/src/p80211/Makefile b/src/p80211/Makefile index f06c776..3ce28ac 100644 --- a/src/p80211/Makefile +++ b/src/p80211/Makefile @@ -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 diff --git a/src/prism2/Makefile b/src/prism2/Makefile index c6a0638..c86d6b9 100644 --- a/src/prism2/Makefile +++ b/src/prism2/Makefile @@ -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 diff --git a/src/prism2/download/Makefile b/src/prism2/download/Makefile index d6765fe..2b95a75 100644 --- a/src/prism2/download/Makefile +++ b/src/prism2/download/Makefile @@ -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 diff --git a/src/prism2/driver/Makefile b/src/prism2/driver/Makefile index 386e3dc..207e8a1 100644 --- a/src/prism2/driver/Makefile +++ b/src/prism2/driver/Makefile @@ -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 diff --git a/src/prism2/ridlist/Makefile b/src/prism2/ridlist/Makefile index ed6e126..b46ee2e 100644 --- a/src/prism2/ridlist/Makefile +++ b/src/prism2/ridlist/Makefile @@ -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__ diff --git a/src/shared/Makefile b/src/shared/Makefile index 8de4fbb..578d7de 100644 --- a/src/shared/Makefile +++ b/src/shared/Makefile @@ -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 - diff --git a/src/skeleton/Makefile b/src/skeleton/Makefile index 9d77caa..3558924 100644 --- a/src/skeleton/Makefile +++ b/src/skeleton/Makefile @@ -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) # diff --git a/src/wlancfg/Makefile b/src/wlancfg/Makefile index ee857a0..da9e015 100644 --- a/src/wlancfg/Makefile +++ b/src/wlancfg/Makefile @@ -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 \ diff --git a/src/wlanctl/Makefile b/src/wlanctl/Makefile index 7bc3cff..4030468 100644 --- a/src/wlanctl/Makefile +++ b/src/wlanctl/Makefile @@ -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 \ diff --git a/src/wland/Makefile b/src/wland/Makefile index 76dab23..73d34b9 100644 --- a/src/wland/Makefile +++ b/src/wland/Makefile @@ -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 \