diff options
| author | bde <bde@FreeBSD.org> | 2004-05-14 19:52:35 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2004-05-14 19:52:35 +0000 |
| commit | 3c92afcdebc5b96abe7889dc5f9152412b1f2fd0 (patch) | |
| tree | e277d3382cb686ade42084dc34b2e4cbf69c7b9b /lib/Makefile | |
| parent | a95c21c1a145348c2a1efd34d0126ded90a2b903 (diff) | |
| download | FreeBSD-src-3c92afcdebc5b96abe7889dc5f9152412b1f2fd0.zip FreeBSD-src-3c92afcdebc5b96abe7889dc5f9152412b1f2fd0.tar.gz | |
Style fixes:
Main ones: mostly use conditional expressions in ifdefs instead of a
mixture of conditional expressions and nested ifdefs.
Nearby ones:
- don't do less than echo the code in the comment about libc_r
- fixed some internal insertion sort errors and indentation errors.
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib/Makefile b/lib/Makefile index 8d223bb..cc1678b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -62,13 +62,10 @@ _libsmb= libsmb _libvgl= libvgl .endif -# libc_r is obsolete on ia64. -.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" && \ - ${MACHINE_ARCH} != "arm" -.if !defined(NOLIBC_R) +.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ + ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBC_R) _libc_r= libc_r .endif -.endif .if ${MACHINE_ARCH} != "arm" _libdisk= libdisk @@ -95,17 +92,14 @@ _libncp= libncp _libsmb= libsmb .endif -.if ${MACHINE_ARCH} != "powerpc" -.if !defined(NOLIBPTHREAD) +.if ${MACHINE_ARCH} != "powerpc" && !defined(NOLIBPTHREAD) _libpthread= libpthread .endif -.endif -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" -.if !defined(NOLIBTHR) +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" && \ + !defined(NOLIBTHR) _libthr= libthr .endif -.endif .if !defined(NO_USB) _libusbhid= libusbhid |
