From 77dbcbfe3e38aa0cb7c13a47b85e794343ca6679 Mon Sep 17 00:00:00 2001 From: speedie Date: Sun, 7 May 2023 20:00:53 +0200 Subject: [PATCH] remove XFTCONF, it's unnecessary --- Makefile | 4 ++-- host.mk | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a45d198..e6f721c 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ VERSION = 1.1 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE) $(LIBCONFIGTOGGLE) $(XRDBTOGGLE) CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations $(OPT) $(INCS) $(CPPFLAGS) LDFLAGS = $(LIBS) -INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` -LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` $(BDLIBS) $(IMLIB2LIBS) +INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` +LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` $(BDLIBS) $(IMLIB2LIBS) SRC = libs/libdrw/draw.c spmenu.c libs/sl/main.c OBJ = $(SRC:.c=.o) diff --git a/host.mk b/host.mk index 4633e0d..61eb03b 100644 --- a/host.mk +++ b/host.mk @@ -23,9 +23,6 @@ X11LIB = /usr/X11R6/lib FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = $(INCDIR)/freetype2 -# xft -XFTCONF = xft - # xrender XRENDERLIBS = -lXrender