From 1d71c9ebd1df43797089f22fe5f61e2abf93821f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 27 Feb 2015 00:14:10 +0100 Subject: library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library. --- nx-X11/programs/Xserver/Imakefile | 2 +- nx-X11/programs/Xserver/hw/nxagent/Holder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver') diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 24e8850d9..d18364b23 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -994,7 +994,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ dix/main.o #endif -XPMLIB = -lNX_Xpm +XPMLIB = -lXpm NXAGENT = hw/nxagent/LibraryTargetName(nxagent) NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI) NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c index bfd907cde..4aca1ecdb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c @@ -33,7 +33,7 @@ #include "../../include/gc.h" #include "../../include/window.h" -#include "xpm.h" +#include #include "Agent.h" #include "Pixmaps.h" -- cgit v1.2.3