[lib] Makefile: remove unneeded -lrt & -lm
-lrt is now added as needed in each module Makefile, but not directly in the library. Furthermore, the Makefiles add -lrt only if the platform is Linux.
This commit is contained in:
parent
fdf683796a
commit
65487af736
|
@ -38,7 +38,7 @@ CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O
|
||||||
DEPFLAGS=-MMD
|
DEPFLAGS=-MMD
|
||||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
||||||
PICFLAG=-fPIC
|
PICFLAG=-fPIC
|
||||||
LIBS = -lrt
|
LIBS =
|
||||||
#STRIPFLAGS= -Wl,-s
|
#STRIPFLAGS= -Wl,-s
|
||||||
#LDFLAGS=
|
#LDFLAGS=
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,12 @@ XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
||||||
PICFLAG=-fPIC
|
PICFLAG=-fPIC
|
||||||
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
||||||
LIBS = -pthread -lconfuse -L$(LIBOWLPS_DIR) -lowlps
|
LIBS = -pthread -lconfuse -L$(LIBOWLPS_DIR) -lowlps
|
||||||
|
|
||||||
|
OS := $(shell uname)
|
||||||
|
ifeq ("$(OS)", "Linux")
|
||||||
|
LIBS += -lrt
|
||||||
|
endif
|
||||||
|
|
||||||
LDFLAGS = $(LIBS) $(OWLPSFLAGS)
|
LDFLAGS = $(LIBS) $(OWLPSFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,8 +33,15 @@ DEPFLAGS = -MMD
|
||||||
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
||||||
PICFLAG = -fPIC
|
PICFLAG = -fPIC
|
||||||
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
||||||
LIBS = -L$(LIBOWLPS_DIR) -lowlps -L$(LIBOWLPSCLIENT_DIR) -lowlps-client
|
LIBS = -L$(LIBOWLPS_DIR) -lowlps \
|
||||||
STATIC_LIBS = -liw -lm -lrt
|
-L$(LIBOWLPSCLIENT_DIR) -lowlps-client
|
||||||
|
|
||||||
|
OS := $(shell uname)
|
||||||
|
ifeq ("$(OS)", "Linux")
|
||||||
|
LIBS += -lrt
|
||||||
|
endif
|
||||||
|
|
||||||
|
STATIC_LIBS =
|
||||||
|
|
||||||
|
|
||||||
## Cibles de compilation standard ##
|
## Cibles de compilation standard ##
|
||||||
|
|
|
@ -38,7 +38,7 @@ PICFLAG = -fPIC
|
||||||
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
||||||
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
||||||
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
||||||
LIBS = $(LOWLPSCLIENTA) -liw -lm
|
LIBS = $(LOWLPSCLIENTA)
|
||||||
DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
|
DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
|
||||||
SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)
|
SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)
|
||||||
STATIC_LIBS = $(LOWLPSA) $(LIBS)
|
STATIC_LIBS = $(LOWLPSA) $(LIBS)
|
||||||
|
|
|
@ -38,7 +38,7 @@ PICFLAG = -fPIC
|
||||||
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
||||||
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
||||||
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
||||||
LIBS = $(LOWLPSCLIENTA) -liw -lm
|
LIBS = $(LOWLPSCLIENTA)
|
||||||
DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
|
DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
|
||||||
SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)
|
SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)
|
||||||
STATIC_LIBS = $(LOWLPSA) $(LIBS)
|
STATIC_LIBS = $(LOWLPSA) $(LIBS)
|
||||||
|
|
|
@ -37,6 +37,12 @@ OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \
|
||||||
LIBS = -L$(LIBOWLPS_DIR) -lowlps \
|
LIBS = -L$(LIBOWLPS_DIR) -lowlps \
|
||||||
-L$(LIBOWLPSCLIENT_DIR) -lowlps-client \
|
-L$(LIBOWLPSCLIENT_DIR) -lowlps-client \
|
||||||
-lpcap -liw
|
-lpcap -liw
|
||||||
|
|
||||||
|
OS := $(shell uname)
|
||||||
|
ifeq ("$(OS)", "Linux")
|
||||||
|
LIBS += -lrt
|
||||||
|
endif
|
||||||
|
|
||||||
LDFLAGS = $(LIBS) $(OWLPSFLAGS)
|
LDFLAGS = $(LIBS) $(OWLPSFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,8 @@ PICFLAG = -fPIC
|
||||||
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
||||||
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
||||||
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
||||||
LIBS = -lpcap -liw -lm $(LOWLPSCLIENTA)
|
LIBS = -lpcap -liw -lrt $(LOWLPSCLIENTA)
|
||||||
|
STATIC_LIBS = -lm
|
||||||
LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib
|
LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib
|
||||||
IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include
|
IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include
|
||||||
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \
|
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \
|
||||||
|
@ -66,7 +67,7 @@ all: dynamic semistatic static
|
||||||
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPSA) $(IATHEROS) $(LATHEROS) $(LDFLAGS)
|
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPSA) $(IATHEROS) $(LATHEROS) $(LDFLAGS)
|
||||||
|
|
||||||
%.static: %.o
|
%.static: %.o
|
||||||
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPS) $(IATHEROS) $(LATHEROS) $(LDFLAGS) -static
|
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPS) $(IATHEROS) $(LATHEROS) $(LDFLAGS) $(STATIC_LIBS) -static
|
||||||
|
|
||||||
%.o: %.c $(HEADER)
|
%.o: %.c $(HEADER)
|
||||||
$(CC) $(XCFLAGS) $(IATHEROS) $(OWLPSFLAGS) -c $<
|
$(CC) $(XCFLAGS) $(IATHEROS) $(OWLPSFLAGS) -c $<
|
||||||
|
|
|
@ -38,7 +38,8 @@ PICFLAG = -fPIC
|
||||||
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
|
||||||
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
|
||||||
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
|
||||||
LIBS = -lpcap -liw -lm $(LOWLPSCLIENTA)
|
LIBS = -lpcap -liw -lrt $(LOWLPSCLIENTA)
|
||||||
|
STATIC_LIBS = -lm
|
||||||
LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib
|
LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib
|
||||||
IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include
|
IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include
|
||||||
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \
|
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \
|
||||||
|
@ -66,7 +67,7 @@ all: dynamic semistatic static
|
||||||
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPSA) $(IATHEROS) $(LATHEROS) $(LDFLAGS)
|
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPSA) $(IATHEROS) $(LATHEROS) $(LDFLAGS)
|
||||||
|
|
||||||
%.static: %.o
|
%.static: %.o
|
||||||
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPS) $(IATHEROS) $(LATHEROS) $(LDFLAGS) -static
|
$(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPS) $(IATHEROS) $(LATHEROS) $(LDFLAGS) $(STATIC_LIBS) -static
|
||||||
|
|
||||||
%.o: %.c $(HEADER)
|
%.o: %.c $(HEADER)
|
||||||
$(CC) $(XCFLAGS) $(IATHEROS) $(OWLPSFLAGS) -c $<
|
$(CC) $(XCFLAGS) $(IATHEROS) $(OWLPSFLAGS) -c $<
|
||||||
|
|
|
@ -37,8 +37,14 @@ LIBOWLPS_DIR = ../libowlps
|
||||||
TESTSGXXFLAGS = -I$(TESTS_DIR) -I$(SRC_DIR) -I.
|
TESTSGXXFLAGS = -I$(TESTS_DIR) -I$(SRC_DIR) -I.
|
||||||
GXXFLAGS = $(DEBUG) -Wall -Wextra -I$(LIBOWLPS_DIR)
|
GXXFLAGS = $(DEBUG) -Wall -Wextra -I$(LIBOWLPS_DIR)
|
||||||
LD = $(CXX)
|
LD = $(CXX)
|
||||||
LDFLAGS = -lstdc++ -lm -lrt -lboost_program_options \
|
LDFLAGS = -lstdc++ -lm -lboost_program_options \
|
||||||
-L$(LIBOWLPS_DIR) -lowlps
|
-L$(LIBOWLPS_DIR) -lowlps
|
||||||
|
|
||||||
|
OS := $(shell uname)
|
||||||
|
ifeq ("$(OS)", "Linux")
|
||||||
|
LDFLAGS += -lrt
|
||||||
|
endif
|
||||||
|
|
||||||
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
||||||
|
|
||||||
# Targets
|
# Targets
|
||||||
|
|
Loading…
Reference in New Issue