diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2015-02-10 21:47:31 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-10 21:47:31 +0100 |
| commit | 6fc37fa762efc55e5d59158eb180cfe1c0405b26 (patch) | |
| tree | f766ed536c848446267b7b050d50f64f0d632e0d /nx-X11 | |
| parent | 1e99734ec8862a68b8f46cf6714d269fff625ec3 (diff) | |
| download | nx-libs-6fc37fa762efc55e5d59158eb180cfe1c0405b26.tar.gz nx-libs-6fc37fa762efc55e5d59158eb180cfe1c0405b26.tar.bz2 nx-libs-6fc37fa762efc55e5d59158eb180cfe1c0405b26.zip | |
Use shared libraries (301_nx-X11_use-shared-libs.full.patch).
Many distributions have a policy to reduce code duplications.
One means to avoid such duplications is to use shared libraries
instead of using libs that are ofter shipped for convenience.
Fedora:
http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries
Debian (Section 10.7.4 of Debian policy):
http://www.debian.org/doc/debian-policy/ch-files.html
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/config/cf/host.def | 11 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 6 | ||||
| -rw-r--r-- | nx-X11/programs/nxauth/Imakefile | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 7d0511f36..2193a4711 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildRenderLibrary YES #define SharedLibFreetype2 YES #define NormalLibFreetype2 YES -#define FontLibSharedFreeType NO +#define FontLibSharedFreeType YES #endif /* @@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ * #define XserverStaticFontLib NO */ +#define XserverStaticFontLib YES /* * To enable binary compatibility with previous versions of the font @@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildXKB YES #define BuildXKBlib YES -#define SharedLibXau NO +#define SharedLibXau YES /* * If you are running NetBSD 0.9C or later, and have the aperture driver @@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildXterm YES */ -#define SharedLibXau NO +#define SharedLibXau YES -#define SharedLibXdmcp NO +#define SharedLibXdmcp YES #define BuildXaw7 YES @@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define BuildFontServer NO #define BuildFreeType NO #define BuildXTrueType NO -#define FontLibSharedFreeType NO +#define FontLibSharedFreeType YES #endif #if !defined(NXZaurusXServer) && defined(NXiPAQXServer) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 8ecb338b2..c803a9915 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ - -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite + -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst + -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ - -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama + -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp #endif #endif diff --git a/nx-X11/programs/nxauth/Imakefile b/nx-X11/programs/nxauth/Imakefile index 07b1ca752..278904f05 100644 --- a/nx-X11/programs/nxauth/Imakefile +++ b/nx-X11/programs/nxauth/Imakefile @@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5 2001/03/30 02:15:23 keithp Exp INCLUDES=-I../../lib DEPLIBS = $(DEPXAUTHLIB) - LOCAL_LIBRARIES = ../../exports/lib/libXau.a + LOCAL_LIBRARIES = $(XAUTHLIB) SRCS = xauth.c gethost.c process.c parsedpy.c OBJS = xauth.o gethost.o process.o parsedpy.o CONN_DEFINES = $(CONNECTION_FLAGS) |