diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-03-04 08:09:34 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-03-04 08:09:34 +0100 |
| commit | 897e2e2dea77603c779659b86791316ccf22cf2b (patch) | |
| tree | 58d4efaae95ad11496f9060b20caf661ecc52f9b /nx-X11/config/cf | |
| parent | 46318a51e8b1834d5165f7b44f7822a258ef2c41 (diff) | |
| parent | 1d71c9ebd1df43797089f22fe5f61e2abf93821f (diff) | |
| download | nx-libs-897e2e2dea77603c779659b86791316ccf22cf2b.tar.gz nx-libs-897e2e2dea77603c779659b86791316ccf22cf2b.tar.bz2 nx-libs-897e2e2dea77603c779659b86791316ccf22cf2b.zip | |
Merge pull request #4 from sunweaver/feature/libxpm-cleanup
library clean-up: Don't build libNX_Xpm anymore. Use system's libXpm shared library.
One release goal for version 3.6.x of nx-libs is dropping as many bundled libraries as possible that haven't
been adapted to nx-libs.
Starting with libNX_Xpm here.
The libNX_Xpm library is only referenced once (nx-X11/programs/Xserver/hw/nxagent/Holder.c).
When grepping through Xserver/hw/nxagent the suspicion comes up, that the libXpm linkage is not
needed at all, because none of the provided functions are used inside the nxagent Xserver.
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 778e3099a..581fdc111 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -3263,9 +3263,9 @@ ProjectUnsharedLibReferences(XFONTENC,NX_fontenc,$(FONTENCLIBSRC),XBuildLibDir) #ifndef SharedXpmRev #define SharedXpmRev 4.11 #endif -SharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) +SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) #else -ProjectUnsharedLibReferences(XPM,NX_Xpm,$(XPMLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #endif #if UseFreetype2 |