From 5cf37514827f2bc762555d96536500692cb481ed Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Sun, 22 Jul 2012 23:47:34 +0200 Subject: [PATCH] common.mk: Move -lm to i3_LIBS --- common.mk | 1 - src/i3.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 57034b02..dda4e35f 100644 --- a/common.mk +++ b/common.mk @@ -77,7 +77,6 @@ CFLAGS += $(call cflags_for_lib, xcb-randr) CFLAGS += $(call cflags_for_lib, xcb) CFLAGS += $(call cflags_for_lib, x11) -LIBS += -lm LIBS += -L $(TOPDIR) -li3 LIBS += $(call ldflags_for_lib, xcb-event,xcb-event) LIBS += $(call ldflags_for_lib, xcb-keysyms,xcb-keysyms) diff --git a/src/i3.mk b/src/i3.mk index 363df0b3..6d77d64c 100644 --- a/src/i3.mk +++ b/src/i3.mk @@ -7,7 +7,7 @@ i3_SOURCES := $(filter-out $(i3_SOURCES_GENERATED),$(wildcard src/*.c) i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h) i3_HEADERS := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard include/*.h)) i3_CFLAGS = $(XCURSOR_CFLAGS) $(YAJL_CFLAGS) $(LIBEV_CFLAGS) $(PCRE_CFLAGS) $(LIBSN_CFLAGS) -i3_LIBS = $(XCURSOR_LIBS) $(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) +i3_LIBS = $(XCURSOR_LIBS) $(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) -lm i3_OBJECTS := $(i3_SOURCES_GENERATED:.c=.o) $(i3_SOURCES:.c=.o) -- 2.39.5