fix even more small issues such as duplicate lines and broken makefile

This commit is contained in:
speedie 2023-03-09 15:09:04 +01:00
parent 5126beae4a
commit 8d4aceb0c2
4 changed files with 18 additions and 21 deletions

View file

@ -59,7 +59,8 @@ compat:
ln -s $(DESTDIR)$(PREFIX)/bin/spmenu_run $(DESTDIR)$(PREFIX)/bin/dmenu_run
uninstall:
$(DESTDIR)$(PREFIX)/bin/spmenu*\
rm -f \
$(DESTDIR)$(PREFIX)/bin/spmenu*
help:
@echo install: Installs spmenu. You may need to run this as root.

26
host.mk
View file

@ -1,43 +1,43 @@
# spmenu
# spmenu - dynamic menu
# See LICENSE file for copyright details.
# compiler
CC = tcc
CC = tcc
# paths
PREFIX = /usr
PREFIX = /usr
MANPREFIX = ${PREFIX}/share/man
# library paths
#
# libx11
X11LIBS = -lX11
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
X11LIBS = -lX11
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
# freetype
FREETYPELIBS = -lfontconfig -lXft
FREETYPEINC = /usr/include/freetype2
FREETYPEINC = /usr/include/freetype2
# xft
XFTCONF = xft
XFTCONF = xft
# xrender
XRENDERLIBS = -lXrender
XRENDERLIBS = -lXrender
# imlib2
IMLIB2LIBS = -lImlib2
IMLIB2LIBS = -lImlib2
# openssl
OPENSSLCONF = openssl
OPENSSLCONF = openssl
# OpenBSD (uncomment)
#FREETYPEINC = $(X11INC)/freetype2
# macOS with XQuartz (uncomment)
#FREETYPEINC = /usr/local/include/freetype2
#X11INC = /opt/X11/include
#X11LIB = /opt/X11/lib
#X11INC = /opt/X11/include
#X11LIB = /opt/X11/lib
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE)
CFLAGS = -std=c99 -pedantic -Wall -O2 $(INCS) $(CPPFLAGS)

View file

@ -1,9 +1,5 @@
# spmenu
# spmenu - dynamic menu
# See LICENSE file for copyright details.
# spmenu version
VERSION = 0.2.2
# includes and libs
INCS = -I$(X11INC) -I$(FREETYPEINC) $(BDINC) `pkg-config --cflags xft $(PANGOCONF) $(PANGOXFTCONF)`
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) $(IMLIB2LIBS) $(BDLIBS) -lm `pkg-config --libs xft $(PANGOCONF) $(PANGOXFTCONF)`

View file

@ -1,4 +1,4 @@
# spmenu
# spmenu - dynamic menu
# See LICENSE file for copyright details.
# Multi-monitor support.
@ -11,7 +11,7 @@ XINERAMATOGGLE = -DXINERAMA
# Comment these lines if you don't need it.
BDLIBS = -lfribidi
BDINC = /usr/include/fribidi
BDTOGGLE = -DFRIBIDI
BDTOGGLE = -DRTL
# Pango
# Comment these lines if you don't need it.