diff --git a/libowlps/Makefile b/libowlps/Makefile index 001e5c2..cafbcc0 100644 --- a/libowlps/Makefile +++ b/libowlps/Makefile @@ -38,7 +38,7 @@ CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG=-fPIC -LIBS = -lrt +LIBS = #STRIPFLAGS= -Wl,-s #LDFLAGS= diff --git a/owlps-aggregator/Makefile b/owlps-aggregator/Makefile index 01a77a4..1164a19 100644 --- a/owlps-aggregator/Makefile +++ b/owlps-aggregator/Makefile @@ -32,6 +32,12 @@ XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG=-fPIC OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" LIBS = -pthread -lconfuse -L$(LIBOWLPS_DIR) -lowlps + +OS := $(shell uname) +ifeq ("$(OS)", "Linux") + LIBS += -lrt +endif + LDFLAGS = $(LIBS) $(OWLPSFLAGS) diff --git a/owlps-client/Makefile b/owlps-client/Makefile index 3bc4546..bdfd0d2 100644 --- a/owlps-client/Makefile +++ b/owlps-client/Makefile @@ -33,8 +33,15 @@ DEPFLAGS = -MMD XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG = -fPIC OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" -LIBS = -L$(LIBOWLPS_DIR) -lowlps -L$(LIBOWLPSCLIENT_DIR) -lowlps-client -STATIC_LIBS = -liw -lm -lrt +LIBS = -L$(LIBOWLPS_DIR) -lowlps \ + -L$(LIBOWLPSCLIENT_DIR) -lowlps-client + +OS := $(shell uname) +ifeq ("$(OS)", "Linux") + LIBS += -lrt +endif + +STATIC_LIBS = ## Cibles de compilation standard ## diff --git a/owlps-client/Makefile_atheros b/owlps-client/Makefile_atheros index f48976c..33bca1a 100644 --- a/owlps-client/Makefile_atheros +++ b/owlps-client/Makefile_atheros @@ -38,7 +38,7 @@ PICFLAG = -fPIC LOWLPS = -L$(LIBOWLPS_DIR) -lowlps LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a -LIBS = $(LOWLPSCLIENTA) -liw -lm +LIBS = $(LOWLPSCLIENTA) DYNAMIC_LIBS = $(LOWLPS) $(LIBS) SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS) STATIC_LIBS = $(LOWLPSA) $(LIBS) diff --git a/owlps-client/Makefile_atheros_openwrt-10.03 b/owlps-client/Makefile_atheros_openwrt-10.03 index 408fb2a..f409c8d 100644 --- a/owlps-client/Makefile_atheros_openwrt-10.03 +++ b/owlps-client/Makefile_atheros_openwrt-10.03 @@ -38,7 +38,7 @@ PICFLAG = -fPIC LOWLPS = -L$(LIBOWLPS_DIR) -lowlps LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a -LIBS = $(LOWLPSCLIENTA) -liw -lm +LIBS = $(LOWLPSCLIENTA) DYNAMIC_LIBS = $(LOWLPS) $(LIBS) SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS) STATIC_LIBS = $(LOWLPSA) $(LIBS) diff --git a/owlps-listener/Makefile b/owlps-listener/Makefile index d36d77b..8b2eddb 100644 --- a/owlps-listener/Makefile +++ b/owlps-listener/Makefile @@ -37,6 +37,12 @@ OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \ LIBS = -L$(LIBOWLPS_DIR) -lowlps \ -L$(LIBOWLPSCLIENT_DIR) -lowlps-client \ -lpcap -liw + +OS := $(shell uname) +ifeq ("$(OS)", "Linux") + LIBS += -lrt +endif + LDFLAGS = $(LIBS) $(OWLPSFLAGS) diff --git a/owlps-listener/Makefile_atheros b/owlps-listener/Makefile_atheros index 7d48922..8bdefb9 100644 --- a/owlps-listener/Makefile_atheros +++ b/owlps-listener/Makefile_atheros @@ -38,7 +38,8 @@ PICFLAG = -fPIC LOWLPS = -L$(LIBOWLPS_DIR) -lowlps LOWLPSA = $(LIBOWLPS_DIR)/libowlps.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 IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \ @@ -66,7 +67,7 @@ all: dynamic semistatic static $(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPSA) $(IATHEROS) $(LATHEROS) $(LDFLAGS) %.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) $(CC) $(XCFLAGS) $(IATHEROS) $(OWLPSFLAGS) -c $< diff --git a/owlps-listener/Makefile_atheros_openwrt-10.03 b/owlps-listener/Makefile_atheros_openwrt-10.03 index 563dc76..2700af1 100644 --- a/owlps-listener/Makefile_atheros_openwrt-10.03 +++ b/owlps-listener/Makefile_atheros_openwrt-10.03 @@ -38,7 +38,8 @@ PICFLAG = -fPIC LOWLPS = -L$(LIBOWLPS_DIR) -lowlps LOWLPSA = $(LIBOWLPS_DIR)/libowlps.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 IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" \ @@ -66,7 +67,7 @@ all: dynamic semistatic static $(CC) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LOWLPSA) $(IATHEROS) $(LATHEROS) $(LDFLAGS) %.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) $(CC) $(XCFLAGS) $(IATHEROS) $(OWLPSFLAGS) -c $< diff --git a/owlps-positioning/Makefile b/owlps-positioning/Makefile index e93792d..0dcc2ec 100644 --- a/owlps-positioning/Makefile +++ b/owlps-positioning/Makefile @@ -37,8 +37,14 @@ LIBOWLPS_DIR = ../libowlps TESTSGXXFLAGS = -I$(TESTS_DIR) -I$(SRC_DIR) -I. GXXFLAGS = $(DEBUG) -Wall -Wextra -I$(LIBOWLPS_DIR) LD = $(CXX) -LDFLAGS = -lstdc++ -lm -lrt -lboost_program_options \ +LDFLAGS = -lstdc++ -lm -lboost_program_options \ -L$(LIBOWLPS_DIR) -lowlps + +OS := $(shell uname) +ifeq ("$(OS)", "Linux") + LDFLAGS += -lrt +endif + OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" # Targets