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.
This commit is contained in:
Sebastian Ramacher 2011-09-29 13:18:09 +02:00
parent c3ad7faf1a
commit ede8a7b236
2 changed files with 3 additions and 7 deletions

View file

@ -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:

View file

@ -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)