jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wlantest: Link without libwlantest

Browse source 
The ar operations with embedded libraries were not exactly portable
or strictly speaking necessary. Drop that library completely to make
this more portable.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2020-04-05 17:58:46 +03:00
parent c25dc978a6
commit d4c3964117
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
wlantest/Makefile
View file

@ -42,8 +42,8 @@ endif
@$(E) " CC " $< @$(E) " CC " $<
OBJS_lib += ../src/utils/libutils.a OWN_LIBS += ../src/utils/libutils.a
OBJS_lib += ../src/crypto/libcrypto.a OWN_LIBS += ../src/crypto/libcrypto.a
CFLAGS += -DCONFIG_OCV CFLAGS += -DCONFIG_OCV
CFLAGS += -DCONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R
@ -98,37 +98,20 @@ TOBJS += gcmp.o
$(MAKE) -C ../src/crypto $(MAKE) -C ../src/crypto
ifneq ($(CONFIG_SOLIB), yes)
LIBWLANTEST = libwlantest.a
libwlantest.a: $(OBJS_lib)
$(AR) crT libwlantest.a $(OBJS_lib)
$(RANLIB) libwlantest.a
else
CFLAGS += -fPIC -DPIC
LDFLAGS += -shared
LIBWLANTEST = libwlantest.so
libwlantest.so: $(OBJS_lib)
$(LDO) $(LDFLAGS) $(OBJS_lib) -o $(LIBWLANTEST)
endif
OBJS_cli = wlantest_cli.o OBJS_cli = wlantest_cli.o
wlantest: $(OBJS) $(LIBWLANTEST) wlantest: $(OBJS) $(OWN_LIBS)
$(LDO) $(LDFLAGS) -o wlantest $(OBJS) -L. -lwlantest $(LIBS) $(LDO) $(LDFLAGS) -o wlantest $(OBJS) $(OWN_LIBS) $(LIBS)
wlantest_cli: $(OBJS_cli) $(LIBWLANTEST) wlantest_cli: $(OBJS_cli) $(OWN_LIBS)
$(LDO) $(LDFLAGS) -o wlantest_cli $(OBJS_cli) -L. -lwlantest $(LIBS) $(LDO) $(LDFLAGS) -o wlantest_cli $(OBJS_cli) $(OWN_LIBS) $(LIBS)
test_vectors: $(TOBJS) $(LIBWLANTEST) test_vectors: $(TOBJS) $(OWN_LIBS)
$(LDO) $(LDFLAGS) -o test_vectors $(TOBJS) -L. -lwlantest $(LIBS) $(LDO) $(LDFLAGS) -o test_vectors $(TOBJS) $(OWN_LIBS) $(LIBS)
clean: clean:
$(MAKE) -C ../src clean $(MAKE) -C ../src clean
rm -f core *~ *.o *.d libwlantest.a libwlantest.so $(ALL) rm -f core *~ *.o *.d $(ALL)
-include $(OBJS:%.o=%.d) -include $(OBJS:%.o=%.d)