diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-30 21:20:21 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-30 21:20:21 +0200 |
| commit | b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6 (patch) | |
| tree | 0e8497952ce92d8c3f271cd1d6a04832b35d1b36 /nx-X11/programs/Xserver/Imakefile | |
| parent | 1ef24c379f8d142180f77ecfe2ab43093c3b7a64 (diff) | |
| parent | 70fde4c748a0466343d308c79ecd4853499b58f1 (diff) | |
| download | nx-libs-b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6.tar.gz nx-libs-b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6.tar.bz2 nx-libs-b06b6b1efe84f5759da3cf6f9dfaf1c2c173aeb6.zip | |
Merge branch 'uli42-pr/various8' into 3.6.x
Attributes GH PR #1025: https://github.com/ArcticaProject/nx-libs/pull/1025
Diffstat (limited to 'nx-X11/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 390ad538b..72ed8484c 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -31,10 +31,10 @@ NULL = #include <Server.tmpl> -/* On most systems the linker requires the libraries in dependency order. +/* On most systems the linker requires the libraries in dependency order. But we have no real order because there are cycles. We fix this by adding - some libraries twice on the commandline. dependLib will add the - dependency library to the commandline if the link order is important */ + some libraries twice on the commandline. dependLib will add the + dependency library to the commandline if the link order is important */ #if 1 /* This is currently enabled for all systems */ #define dependLib(x) x #else @@ -43,7 +43,7 @@ NULL = #if defined(XorgVersion) /* Do not strip server binaries */ -INSTPGMFLAGS = +INSTPGMFLAGS = #endif #define PreFbLibs $(DIX) $(OS) $(XPDDX) @@ -136,7 +136,7 @@ INSTPGMFLAGS = FB = fb/LibraryTargetName(fb) DAMAGE = miext/damage/LibraryTargetName(damage) SHADOW = miext/shadow/LibraryTargetName(shadow) - LAYER = miext/layer/LibraryTargetName(layer) + LAYER = miext/layer/LibraryTargetName(layer) #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture)) /* Order of libraries is important when linking in mingw or * cygwin. libmi.a requires ffs from libdix.a. So it is added @@ -147,7 +147,7 @@ INSTPGMFLAGS = #endif MIINITEXTOBJ = mi/miinitext.o DIX = dix/LibraryTargetName(dix) -#if UsbMouseSupport +#if UsbMouseSupport #if !HasLibUsb USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb) #else |