openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-09 02:39:00 +00:00
Code Issues Projects Releases Wiki Activity

Explicitely build sxpm in app, after the new libXpm has been installed.

Browse Source 
This makes sure it is linked against the new libXpm, not the existing
one in /usr/X11R6/lib which may reference to an old, incompatible libc.
ok tb@
This commit is contained in:
matthieu
2024-06-04 05:42:22 +00:00
parent 2877dc3d08
commit 572bde4175
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/sxpm/Makefile Normal file
View 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>

2
lib/libXpm/Makefile.am
View File

@@ -1,7 +1,7 @@
# Daniel Stone disowns all copyright on this file; no warranty is given as to its
# suitability or otherwise.
SUBDIRS = doc include man src sxpm cxpm test
SUBDIRS = doc include man src cxpm test
ACLOCAL_AMFLAGS = -I m4

2
lib/libXpm/Makefile.in
View File

@@ -327,7 +327,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = doc include man src sxpm cxpm test
SUBDIRS = doc include man src cxpm test
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xpm.pc