jachym/dwl
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl.git synced 2025-10-26 17:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use POSIX.1-2024 (aka Issue 8) in the makefile

Browse Source
This commit is contained in:
Leonardo Hernández Hernández 2024-08-01 20:07:36 -06:00
parent 0caa658276
commit 8db4ed06e4
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -4,17 +4,19 @@
include config.mk include config.mk
# flags for compiling # flags for compiling
DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L \ DWLCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \
-DVERSION=\"$(VERSION)\" $(XWAYLAND)
DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \
-Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \ -Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \
-Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \ -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \
-Wfloat-conversion -Wfloat-conversion
DWLCFLAGS += -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L \
-DVERSION=\"$(VERSION)\" $(XWAYLAND)
# CFLAGS / LDFLAGS # CFLAGS / LDFLAGS
PKGS = wayland-server xkbcommon libinput $(XLIBS) PKGS = wayland-server xkbcommon libinput $(XLIBS)
DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS) PKGS_INCS != $(PKG_CONFIG) --cflags $(PKGS)
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS) DWLCFLAGS += $(WLR_INCS) $(PKGS_INCS) $(CFLAGS)
PKGS_LIBS != $(PKG_CONFIG) --libs $(PKGS)
LDLIBS += $(WLR_LIBS) $(PKGS_LIBS) -lm $(LIBS)
all: dwl all: dwl
dwl: dwl.o util.o dwl: dwl.o util.o
@ -27,8 +29,8 @@ util.o: util.c util.h
# wayland-scanner is a tool which generates C headers and rigging for Wayland # wayland-scanner is a tool which generates C headers and rigging for Wayland
# protocols, which are specified in XML. wlroots requires you to rig these up # protocols, which are specified in XML. wlroots requires you to rig these up
# to your build system yourself and provide them in the include path. # to your build system yourself and provide them in the include path.
WAYLAND_SCANNER = `$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner` WAYLAND_SCANNER != $(PKG_CONFIG) --variable=wayland_scanner wayland-scanner
WAYLAND_PROTOCOLS = `$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols` WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable=pkgdatadir wayland-protocols
cursor-shape-v1-protocol.h: cursor-shape-v1-protocol.h:
$(WAYLAND_SCANNER) enum-header \ $(WAYLAND_SCANNER) enum-header \

10
config.mk
View File

@ -1,7 +1,7 @@
_VERSION = 0.8-dev _VERSION = 0.8-dev
VERSION = `git describe --tags --dirty 2>/dev/null || echo $(_VERSION)` VERSION != git describe --tags --dirty 2>/dev/null || echo $(_VERSION)
PKG_CONFIG = pkg-config PKG_CONFIG ?= pkg-config
# paths # paths
PREFIX = /usr/local PREFIX = /usr/local
@ -21,8 +21,8 @@ DATADIR = $(PREFIX)/share
# -I$(PWD)/wlroots/0.19/include/wlroots-0.19 # -I$(PWD)/wlroots/0.19/include/wlroots-0.19
#WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19 #WLR_LIBS = -Wl,-rpath,$(PWD)/wlroots/0.19/lib64 -L$(PWD)/wlroots/0.19/lib64 -lwlroots-0.19
WLR_INCS = `$(PKG_CONFIG) --cflags wlroots-0.19` WLR_INCS != $(PKG_CONFIG) --cflags wlroots-0.19
WLR_LIBS = `$(PKG_CONFIG) --libs wlroots-0.19` WLR_LIBS != $(PKG_CONFIG) --libs wlroots-0.19
XWAYLAND = XWAYLAND =
XLIBS = XLIBS =
@ -33,4 +33,4 @@ XLIBS =
# dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11). # dwl itself only uses C99 features, but wlroots' headers use anonymous unions (C11).
# To avoid warnings about them, we do not use -std=c99 and instead of using the # To avoid warnings about them, we do not use -std=c99 and instead of using the
# gmake default 'CC=c99', we use cc. # gmake default 'CC=c99', we use cc.
CC = cc CC ?= cc