From ede8a7b236958d002d96a955c4ccd09055f0da66 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Thu, 29 Sep 2011 13:18:09 +0200 Subject: [PATCH] Change NEED_DL to DL_LIB to be consistent with other options. Run you don't need do link against dl set DL_LIB to a empty value. --- Makefile | 4 ---- config.mk | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a9d8902..649c8bc 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,6 @@ SOURCE = $(shell find . -iname "*.c") OBJECTS = $(patsubst %.c, %.o, $(SOURCE)) DOBJECTS = $(patsubst %.c, %.do, $(SOURCE)) -ifneq "$(NEEDS_DL)" "0" -LIBS += -ldl -endif - all: options ${PROJECT} options: diff --git a/config.mk b/config.mk index 3363edc..7a4d602 100644 --- a/config.mk +++ b/config.mk @@ -10,8 +10,6 @@ MANPREFIX ?= ${PREFIX}/share/man # libs # set this to 0 if you don't need to link against dl -NEEDS_DL ?= 1 - GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) GTK_LIB ?= $(shell pkg-config --libs gtk+-2.0 gthread-2.0) @@ -21,8 +19,10 @@ GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2) SQLITE_INC ?= $(shell pkg-config --cflags sqlite3) SQLITE_LIB ?= $(shell pkg-config --libs sqlite3) +DL_LIB ?= -ldl + INCS = ${GIRARA_INC} ${GTK_INC} $(SQLITE_INC) -LIBS = ${GIRARA_LIB} ${GTK_LIB} $(SQLITE_LIB) -lpthread -lm +LIBS = ${GIRARA_LIB} ${GTK_LIB} $(SQLITE_LIB) $(DL_LIB) -lpthread -lm # flags CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)