|
 |
21ef37 |
From c2632c18a38854ae493718791f3fe9749c6ceb9d Mon Sep 17 00:00:00 2001
|
|
|
21ef37 |
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
21ef37 |
Date: Sat, 30 Jul 2016 15:15:14 +0200
|
|
|
21ef37 |
Subject: [PATCH 08/43] Makefile: allow to pass additional LIBS
|
|
|
21ef37 |
|
|
|
21ef37 |
We need to be able to pass extra LIBS when our toolchain lacks NLS
|
|
|
21ef37 |
support, this way we can build libintl and link to it. A good example
|
|
|
21ef37 |
is uClibc with locale support disabled.
|
|
|
21ef37 |
|
|
|
21ef37 |
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
21ef37 |
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
|
21ef37 |
---
|
|
|
21ef37 |
src/Makefile | 2 +-
|
|
|
21ef37 |
src/gui/Makefile | 2 +-
|
|
|
21ef37 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
21ef37 |
|
|
|
21ef37 |
diff --git a/src/Makefile b/src/Makefile
|
|
|
21ef37 |
index b50586b..acbdbfa 100644
|
|
|
21ef37 |
--- a/src/Makefile
|
|
|
21ef37 |
+++ b/src/Makefile
|
|
|
21ef37 |
@@ -30,7 +30,7 @@ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
|
|
21ef37 |
LDFLAGS+= -Wl,--as-needed
|
|
|
21ef37 |
endif
|
|
|
21ef37 |
LDSTATIC=-static
|
|
|
21ef37 |
-LIBS=-llshw -lresolv
|
|
|
21ef37 |
+LIBS+=-llshw -lresolv
|
|
|
21ef37 |
ifeq ($(SQLITE), 1)
|
|
|
21ef37 |
LIBS+= $(shell pkg-config --libs sqlite3)
|
|
|
21ef37 |
endif
|
|
|
21ef37 |
diff --git a/src/gui/Makefile b/src/gui/Makefile
|
|
|
21ef37 |
index 332ce57..7f72e3f 100644
|
|
|
21ef37 |
--- a/src/gui/Makefile
|
|
|
21ef37 |
+++ b/src/gui/Makefile
|
|
|
21ef37 |
@@ -11,7 +11,7 @@ INCLUDES=-I../core $(GTKINCLUDES)
|
|
|
21ef37 |
CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
|
|
21ef37 |
CFLAGS=$(CXXFLAGS) $(DEFINES)
|
|
|
21ef37 |
GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
|
|
|
21ef37 |
-LIBS=-L../core -llshw -lresolv $(GTKLIBS)
|
|
|
21ef37 |
+LIBS+=-L../core -llshw -lresolv $(GTKLIBS)
|
|
|
21ef37 |
LDFLAGS=
|
|
|
21ef37 |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
|
|
21ef37 |
LDFLAGS+= -Wl,--as-needed
|
|
|
21ef37 |
--
|
|
|
21ef37 |
2.10.2
|
|
|
21ef37 |
|