nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganise CLFAGS/LDFLAGS handling

Browse Source
This commit is contained in:
Benedikt Heine 2017-10-22 03:55:19 +02:00
parent 1091a976f2
commit bfc8b17c27
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -8,8 +8,17 @@ ifneq ($(wildcard ./.git/.),)
VERSION := $(shell git describe --tags) VERSION := $(shell git describe --tags)
endif endif
CFLAGS += -I. LIBS := $(shell pkg-config --libs ${pkg_config_packs})
LDFLAGS += -L. INCS := $(shell pkg-config --cflags ${pkg_config_packs})
ifneq (clean, $(MAKECMDGOALS))
ifeq ($(and $(INCS),$(LIBS)),)
$(error "pkg-config failed!")
endif
endif
CFLAGS += -I. ${INCS}
LDFLAGS+= -L. ${LIBS}
SRC := $(sort $(shell find src/ -name '*.c')) SRC := $(sort $(shell find src/ -name '*.c'))
OBJ := ${SRC:.c=.o} OBJ := ${SRC:.c=.o}

33
config.mk
View File

@ -2,23 +2,24 @@
PREFIX ?= /usr/local PREFIX ?= /usr/local
MANPREFIX = ${PREFIX}/share/man MANPREFIX = ${PREFIX}/share/man
# Warning: This is deprecated behavior
# uncomment to disable parsing of dunstrc # uncomment to disable parsing of dunstrc
# or use "CFLAGS=-DSTATIC_CONFIG make" to build # or use "CFLAGS=-DSTATIC_CONFIG make" to build
#STATIC= -DSTATIC_CONFIG #STATIC= -DSTATIC_CONFIG # Warning: This is deprecated behavior
PKG_CONFIG:=$(shell which pkg-config)
ifeq (${PKG_CONFIG}, ${EMPTY})
$(error "Failed to find pkg-config, please make sure it is installed")
endif
# flags # flags
CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS} CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS}
LDFLAGS += -lm -L${X11LIB}
pkg_config_packs := dbus-1 x11 xscrnsaver \ pkg_config_packs := dbus-1 \
"glib-2.0 >= 2.36" gio-2.0 \ gio-2.0 \
pangocairo gdk-3.0 xrandr xinerama gdk-3.0 \
"glib-2.0 >= 2.36" \
pangocairo \
x11 \
xinerama \
xrandr \
xscrnsaver
# check if we need libxdg-basedir # check if we need libxdg-basedir
ifeq (,$(findstring STATIC_CONFIG,$(CFLAGS))) ifeq (,$(findstring STATIC_CONFIG,$(CFLAGS)))
@ -31,15 +32,3 @@ endif
ifneq (,$(findstring dunstify,${MAKECMDGOALS})) ifneq (,$(findstring dunstify,${MAKECMDGOALS}))
pkg_config_packs += libnotify pkg_config_packs += libnotify
endif endif
# includes and libs
INCS := $(shell ${PKG_CONFIG} --cflags ${pkg_config_packs})
CFLAGS += ${INCS}
LDFLAGS += -lm -L${X11LIB} -lXss $(shell ${PKG_CONFIG} --libs ${pkg_config_packs})
# only make this an fatal error when where not cleaning
ifneq (clean, $(MAKECMDGOALS))
ifeq (${INCS}, ${EMPTY})
$(error "pkg-config failed, see errors above")
endif
endif