sync with OpenBSD -current
This commit is contained in:
parent
11caf8af74
commit
3d9c23ff6f
6 changed files with 25 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
||||||
# $OpenBSD: Makefile,v 1.38 2019/08/15 17:01:12 matthieu Exp $
|
# $OpenBSD: Makefile,v 1.39 2024/06/04 08:13:08 matthieu Exp $
|
||||||
.include <bsd.xconf.mk>
|
.include <bsd.xconf.mk>
|
||||||
|
|
||||||
SUBDIR= bdftopcf mkfontscale \
|
SUBDIR= bdftopcf mkfontscale \
|
||||||
|
@ -22,7 +22,7 @@ SUBDIR += xdriinfo glxgears glxinfo
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# extras
|
# extras
|
||||||
SUBDIR += cwm fvwm ssh-askpass video xterm xidle xlockmore \
|
SUBDIR += cwm fvwm ssh-askpass sxpm video xterm xidle xlockmore \
|
||||||
xtsscale xvctl
|
xtsscale xvctl
|
||||||
|
|
||||||
.include <bsd.subdir.mk>
|
.include <bsd.subdir.mk>
|
||||||
|
|
19
app/sxpm/Makefile
Normal file
19
app/sxpm/Makefile
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
# $OpenBSD: Makefile,v 1.1 2024/06/04 05:42:22 matthieu Exp $
|
||||||
|
|
||||||
|
.include <bsd.xconf.mk>
|
||||||
|
|
||||||
|
PROG=sxpm
|
||||||
|
NOMAN=
|
||||||
|
|
||||||
|
CPPFLAGS+= -I${X11BASE}/include
|
||||||
|
|
||||||
|
LDADD+= -L${X11BASE}/lib -lXt -lX11 -lXext -lXpm
|
||||||
|
|
||||||
|
MANDIR= ${X11BASE}/man/man
|
||||||
|
|
||||||
|
obj: _xenocara_obj
|
||||||
|
|
||||||
|
.PATH.c: ${.CURDIR}/../../lib/libXpm/sxpm
|
||||||
|
|
||||||
|
.include <bsd.prog.mk>
|
||||||
|
.include <bsd.xorg.mk>
|
|
@ -1,7 +1,7 @@
|
||||||
# Daniel Stone disowns all copyright on this file; no warranty is given as to its
|
# Daniel Stone disowns all copyright on this file; no warranty is given as to its
|
||||||
# suitability or otherwise.
|
# suitability or otherwise.
|
||||||
|
|
||||||
SUBDIRS = doc include man src sxpm cxpm test
|
SUBDIRS = doc include man src cxpm test
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
|
|
@ -327,7 +327,7 @@ target_alias = @target_alias@
|
||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
SUBDIRS = doc include man src sxpm cxpm test
|
SUBDIRS = doc include man src cxpm test
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = xpm.pc
|
pkgconfig_DATA = xpm.pc
|
||||||
|
|
|
@ -12,5 +12,5 @@ ChangeLog:
|
||||||
|
|
||||||
dist-hook: ChangeLog INSTALL
|
dist-hook: ChangeLog INSTALL
|
||||||
|
|
||||||
SUBDIRS = image test
|
SUBDIRS = image
|
||||||
EXTRA_DIST = autogen.sh README.md
|
EXTRA_DIST = autogen.sh README.md
|
||||||
|
|
|
@ -298,7 +298,7 @@ top_srcdir = @top_srcdir@
|
||||||
xcbincludedir = @xcbincludedir@
|
xcbincludedir = @xcbincludedir@
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
SUBDIRS = image test
|
SUBDIRS = image
|
||||||
EXTRA_DIST = autogen.sh README.md
|
EXTRA_DIST = autogen.sh README.md
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue