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

more kernel/non-kernel pcmcia compile fixups.

Browse source
This commit is contained in:
solomon 2002-09-04 20:11:15 +00:00
parent 45e3886150
commit c978cc1d44
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configure
View file

@ -400,7 +400,7 @@ if [ $PRISM2_PCMCIA = "y" ] ; then
if [ ! $WLAN_KERN_PCMCIA = "y" ] ; then
grep CONFIG_MODVERSIONS=y < $PCMCIA_SRC/config.mk > /dev/null
if [ $? = 0 ] ; then
PCMCIA_MODFLAGS="-DMODVERSIONS $PCMCIA_SRC/include/linux/modversion.h"
PCMCIA_MODFLAGS="-DMODVERSIONS -include $PCMCIA_SRC/include/linux/modversions.h"
fi
dump_str "PCMCIA_MODFLAGS=-DMODULE $PCMCIA_MODFLAGS"
fi

11
src/prism2/driver/Makefile
View file

@ -139,19 +139,18 @@ endif
# Preprocessor Options
CPPFLAGS=-I../../include -I../include $(WLAN_INCLUDE_DEBUG)
CFLAGS = $(KERNEL_CFLAGS) $(KERNEL_MODFLAGS)
# Use the following if building for kernel pcmcia
ifeq ($(WLAN_KERN_PCMCIA), y)
CS_SYSINC=
CFLAGS = $(KERNEL_CFLAGS) $(KERNEL_MODFLAGS)
CS_CFLAGS= $(CFLAGS)
else
CS_SYSINC=-I$(PCMCIA_SRC)/include $(WLAN_CS_CONFIG_SNIFF)
CFLAGS = $(KERNEL_CFLAGS) $(PCMCIA_MODFLAGS)
CS_CFLAGS=-I$(PCMCIA_SRC)/include $(WLAN_CS_CONFIG_SNIFF) $(KERNEL_CFLAGS) $(PCMCIA_MODFLAGS)
endif
# Implicit rules to handle the separate obj dirs
$(CS_OBJ_DIR)/%.o : %.c
$(CC) -c $(CS_SYSINC) $(CFLAGS) $(CPPFLAGS) \
$(CC) -c $(CS_CFLAGS) $(CPPFLAGS) \
-DWLAN_HOSTIF=WLAN_PCMCIA $< -o $@
$(PLX_OBJ_DIR)/%.o : %.c
@ -261,7 +260,7 @@ endif
rm -f $@
for i in $(DEP_SRC); do \
(/bin/echo -n $(CS_OBJ_DIR)/ ; \
$(CPP) -DWLAN_HOSTIF=WLAN_PCMCIA -M $(CS_SYSINC) $(CFLAGS) $(CPPFLAGS) \
$(CPP) -DWLAN_HOSTIF=WLAN_PCMCIA -M $(CS_CFLAGS) $(CPPFLAGS) \
$$i ) \
>> $@ ; \
done