Changeset 20

Show
Ignore:
Timestamp:
03/15/03 19:30:51 (9 years ago)
Author:
sam
Message:

Replicated Change 41 by sam@borg_greg on 2003/02/21 21:21:04<<<

fix wlan-driver module dependency stuff--need to honor
MODVERSIONS and generate symbol version gunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cvs-import/trunk/Makefile.inc

    r17 r20  
    2828 
    2929include ${KERNEL_PATH}/.config 
     30 
     31ifdef CONFIG_SMP 
     32COPTS+= -D__SMP__ -DSMP 
     33endif 
     34 
     35ifndef CONFIG_FRAME_POINTER 
     36COPTS+= -fomit-frame-pointer 
     37endif 
     38 
     39ifdef CONFIG_MODVERSIONS 
     40MODOPTS=-DMODVERSIONS -include $(KERNEL_PATH)/include/linux/modversions.h 
     41MODOPTS+= -include ${WLAN}/if_ieee80211.ver 
     42MODOPTS+= -include ${WLAN}/if_media.ver 
     43endif 

  • cvs-import/trunk/driver/Makefile

    r17 r20  
    1010 
    1111OBJS_COMMON=    ah_osdep.o if_ath.o 
    12 OBJS_CS=        ${OBJS_COMMON} ${ATH_HAL}/hal.o if_ath_cs.o ${WLAN}/wlan.o 
    13 OBJS_PCI=       ${OBJS_COMMON} ${ATH_HAL}/hal.o if_ath_pci.o ${WLAN}/wlan.o 
     12OBJS_CS=        ${OBJS_COMMON} ${ATH_HAL}/hal.o if_ath_cs.o 
     13OBJS_PCI=       ${OBJS_COMMON} ${ATH_HAL}/hal.o if_ath_pci.o 
    1414OBJS=           ${OBJS_COMMON} if_ath_cs.o if_ath_pci.o 
    1515 
    1616CFLAGS= -I. -I${ATH_HAL} -I${HAL} -I${WLAN} -I${LINUX} \ 
    17         -D_BUILD_STANDALONE_ -D__KERNEL__ -DMODULE ${COPTS} 
     17        -D_BUILD_STANDALONE_ -D__KERNEL__ -DMODULE ${MODOPTS} ${COPTS} 
    1818 
    1919#ALL=   ath_cs.o ath_pci.o 
    …… 
    2929ath_pci.o: ${OBJS_PCI} Makefile 
    3030        ${LD} -o $@ -r -x -S ${OBJS_PCI} 
     31ifdef CONFIG_MODVERSIONS 
     32if_ath.o:       ${WLAN}/if_ieee80211.ver ${WLAN}/if_media.ver 
     33if_ath_pci.o:   ${WLAN}/if_ieee80211.ver ${WLAN}/if_media.ver 
     34if_ath_cs.o:    ${WLAN}/if_ieee80211.ver ${WLAN}/if_media.ver 
     35endif 
    3136 
    3237clean: 

  • cvs-import/trunk/wlan/Makefile

    r17 r20  
    1010OBJS=   if_ieee80211subr.o if_media.o rc4.o 
    1111 
    12 #CFLAGS=       -I. -I${LINUX} -D__KERNEL__ -DMODULE ${COPTS} 
    13 CFLAGS= -I. -I${LINUX} -D__KERNEL__ ${COPTS} 
     12INCS=  -I. -I${LINUX} 
     13CFLAGS= ${INCS} -D__KERNEL__ -DMODULE ${MODOPTS} ${COPTS} 
    1414 
    15 all:    wlan.o 
     15ALL=    wlan.o 
     16ifdef CONFIG_MODVERSIONS 
     17ALL_VER=if_ieee80211.ver if_media.ver 
     18endif 
     19 
     20all:    ${ALL} ${ALL_VER} 
    1621 
    1722wlan.o: ${OBJS} 
    1823        ${LD} -o $@ -r -x ${OBJS} 
     24 
     25ifdef CONFIG_MODVERSIONS 
     26GENKSYMS=       /sbin/genksyms 
     27ifdef CONFIG_SMP 
     28GENKSYMS+=      -p smp_ 
     29endif 
     30 
     31if_ieee80211.ver: if_ieee80211subr.c 
     32        ${CC} ${INCS} ${COPTS} -E -D__GENKSYMS__ $< | ${GENKSYMS} -k ${VERSION} > $@ 
     33if_media.ver: if_media.c 
     34        ${CC} ${INCS} ${COPTS} -E -D__GENKSYMS__ $< | ${GENKSYMS} -k ${VERSION} > $@ 
     35 
     36${OBJS}: if_ieee80211.ver if_media.ver 
     37endif 
    1938 
    2039install: all 
    …… 
    2241 
    2342clean: 
    24         rm -f ${OBJS} wlan.o .depend 
     43        rm -f ${OBJS} ${ALL} ${ALL_VER} .depend 
    2544 
    26 depend: 
     45depend:        ${ALL_VER} 
    2746        gcc -M ${CFLAGS} ${SRCS} > .depend 
    2847