Merge remote-tracking branch 'upstream/main' into wlroots-next
This commit is contained in:
		
							
								
								
									
										20
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								Makefile
									
									
									
									
									
								
							| @@ -4,9 +4,12 @@ | ||||
| include config.mk | ||||
|  | ||||
| # flags for compiling | ||||
| DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XWAYLAND) | ||||
| DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement -Wno-unused-parameter -Wshadow -Wunused-macros\ | ||||
| 	-Werror=strict-prototypes -Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types -Wfloat-conversion | ||||
| DWLCPPFLAGS = -I. -DWLR_USE_UNSTABLE -D_POSIX_C_SOURCE=200809L \ | ||||
| 	-DVERSION=\"$(VERSION)\" $(XWAYLAND) | ||||
| DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement \ | ||||
| 	-Wno-unused-parameter -Wshadow -Wunused-macros -Werror=strict-prototypes \ | ||||
| 	-Werror=implicit -Werror=return-type -Werror=incompatible-pointer-types \ | ||||
| 	-Wfloat-conversion | ||||
|  | ||||
| # CFLAGS / LDFLAGS | ||||
| PKGS      = wlroots-0.18 wayland-server xkbcommon libinput $(XLIBS) | ||||
| @@ -16,7 +19,9 @@ LDLIBS    = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS) | ||||
| all: dwl | ||||
| dwl: dwl.o util.o | ||||
| 	$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@ | ||||
| dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h | ||||
| dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \ | ||||
| 	pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \ | ||||
| 	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h | ||||
| util.o: util.c util.h | ||||
|  | ||||
| # wayland-scanner is a tool which generates C headers and rigging for Wayland | ||||
| @@ -48,8 +53,8 @@ clean: | ||||
|  | ||||
| dist: clean | ||||
| 	mkdir -p dwl-$(VERSION) | ||||
| 	cp -R LICENSE* Makefile CHANGELOG.md README.md client.h config.def.h\ | ||||
| 		config.mk protocols dwl.1 dwl.c util.c util.h dwl.desktop\ | ||||
| 	cp -R LICENSE* Makefile CHANGELOG.md README.md client.h config.def.h \ | ||||
| 		config.mk protocols dwl.1 dwl.c util.c util.h dwl.desktop \ | ||||
| 		dwl-$(VERSION) | ||||
| 	tar -caf dwl-$(VERSION).tar.gz dwl-$(VERSION) | ||||
| 	rm -rf dwl-$(VERSION) | ||||
| @@ -65,7 +70,8 @@ install: dwl | ||||
| 	cp -f dwl.desktop $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop | ||||
| 	chmod 644 $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop | ||||
| uninstall: | ||||
| 	rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1 $(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop | ||||
| 	rm -f $(DESTDIR)$(PREFIX)/bin/dwl $(DESTDIR)$(MANDIR)/man1/dwl.1 \ | ||||
| 		$(DESTDIR)$(DATADIR)/wayland-sessions/dwl.desktop | ||||
|  | ||||
| .SUFFIXES: .c .o | ||||
| .c.o: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user