Commit Graph

46 Commits

Author SHA1 Message Date
lukem efcc9a4c9d * Add user-controlled mk.conf variables
- SHLIBDIR	Location to install shared libraries if ${USE_SHLIBDIR}
			is "yes".  Defaults to "/usr/lib".

	- USE_SHLIBDIR	If "yes", install shared libraries in ${SHLIBDIR}
			instead of ${LIBDIR}.  Defaults to "no".
			Sets ${_LIBSODIR} to the appropriate value.
			This may be set by individual Makefiles as well.

	- SHLINKDIR	Location of shared linker.  Defaults to "/usr/libexec".
			If != "/usr/libexec", change the dynamic-linker
			encoded in shared programs

* Set USE_SHLIBDIR for libraries used by /bin and /sbin:
	libc libcrypt libcrypto libedit libipsec libkvm libm libmi387
	libtermcap libutil libz

* If ${_LIBSODIR} != ${LIBDIR}, add symlinks from ${LIBDIR}/${LIB}.so*
  to ${_LIBSODIR}/${LIB}.so* for compatibility.

* Always install /sbin/init statically (for now)


The net effect of these changes depends on how the variables are set:

  1.)	If nothing is set or changed, there is no change from the
	current behaviour:
		- Static /bin, /sbin, and bits of /usr/*
		- Dynamic rest
		- Shared linker is /usr/libexec/ld*so

  2.)	If the following make variables are set:
		LDSTATIC=
		SHLINKDIR=/lib
		SHLIBDIR=/lib
	Then the behaviour becomes:
		- Dynamic tools
		- .so libraries used by /bin and /sbin are installed to /lib,
		  with symlinks from /usr/lib/lib*so to -> /lib/lib*so
		  where appropriate
		- Shared linker is /lib/ld*so

  3.)	As per 2.), but add the following variable:
		USE_SHLIBDIR=yes
	This forces all .so's to be instaleld in /lib (with compat
	symlinks), not just those tagged by their Makefiles to be.
	Again, compat symlinks are installed
2001-12-28 01:32:37 +00:00
tv 001067bbd1 Readability cleanups; MKfoo=no -> NOfoo. 2001-12-12 00:51:00 +00:00
wiz 456dff6cb8 Spell 'occurred' with two 'r's. 2001-09-16 16:34:23 +00:00
itojun e30f75ded9 declare __P if missing 2001-01-08 14:53:19 +00:00
itojun 60a6af6e96 do not declare OF() in header. use __P().
maybe we could have ansified it, but did not for possible feedback to the
original zlib distribution
2001-01-08 14:48:19 +00:00
sommerfeld 12c2f5bd9a Add format checking 2000-10-04 17:12:01 +00:00
thorpej 728d672378 Backout my libsa changes. 1999-11-13 21:33:12 +00:00
simonb f5f92cb0f4 Sync with src/sys/lib/libz/zutil.h. 1999-11-12 12:14:20 +00:00
itojun 31f706c2ef fix backward-compatible upgrade function name. (__RENAME thing)
the digit after the function name must be (shlib major + 1).

From: Klaus Klein <kleink@ira.uka.de>
1999-10-26 22:16:48 +00:00
itojun 52c808fa73 increase shlib minor for z_off_t changes. 1999-10-26 10:00:29 +00:00
itojun fb26763771 make z_off_t into off_t, which used to be "long" by mistake.
backward compatibility functions are supplied.

XXX increase shlib major, or minor?
1999-10-26 03:42:58 +00:00
garbled 61abb01179 libz works much better when the examples aren't compiled into the
library.  This caused severe pain with c++, as the example contained
a main().
1999-07-09 07:07:13 +00:00
simonb 10b4ca41b4 Revert white space changes for imported sources. 1999-07-03 12:30:16 +00:00
simonb 6bf3aa19f9 More trailing white space. 1999-07-02 15:46:05 +00:00
christos d9d6177e6a Somehow I forgot to update the changes from the kernel. 1999-05-03 09:41:08 +00:00
abs edc1a24a56 Add a note to update src/distrib/sets/lists/base/shl.*, and add a missing
RCS Id.
1999-02-25 08:02:19 +00:00
lukem dcab0210a0 convert from NOxxx= to MKxxx=no.
include <bsd.own.mk> if testing a MKxxx variable.
1999-02-13 02:54:17 +00:00
tron b3c5527722 Sync with file in "src/sys/lib/libz". 1998-11-03 22:05:43 +00:00
tron bce471cd9e Bump minor version because some function calls were added. 1998-11-02 08:17:09 +00:00
tron 36d279e15c Resolve import conflicts. 1998-11-01 20:33:24 +00:00
tron fa4fef0f6d Import zlib version 1.1.3. 1998-11-01 19:48:17 +00:00
cgd d376f961fd if _STANDALONE or _KERNEL, don't include standard headers and pull
in libkern.h instead.  (That doesn't even appear to be necessary,
but it's the 'standard' thing to do.)
1998-03-27 01:10:43 +00:00
perry 93db5caa95 RCSID Police. 1998-01-05 07:41:06 +00:00
lukem 570f447f0e use CPPFLAGS instead of CFLAGS 1997-10-23 03:31:09 +00:00
lukem 5542a7ca43 - define WARNS?=1 in the top-level Makefile.inc, and don't define
anywhere else.
- for now, override WARNS=0 in librpcsvc and libwrap, until they're
  cleaned up
- rcsid police

lib is now clean (except for librpcsvc and libwrap) on the i386, and
this should motivate the other ports to fix any other minor problems
that their compilers pick up that the i386 version doesn't.
1997-10-09 14:36:17 +00:00
lukem ae6b9c674a WARNSify 1997-10-09 11:58:15 +00:00
veego 3d60b93f30 Remove the uneeded HDRS= line and add zconf.h to the INCS= line. 1997-05-25 22:58:09 +00:00
gwr f3e1b81b8e This is just a test program, so leave the strcat (etc.) calls alone.
The changes to strncat (etc.) did not compile anyway...
1997-05-13 23:36:03 +00:00
gwr 8304862426 Put the original CVS Id strings back in. 1997-05-13 23:06:27 +00:00
gwr 371ce0e795 Remove _ZLIB_PRIVATE and all related changes. The "exported" API
of this library includes the typedefs in zconf.h so export it too.
Our zlib should now work with "png" (fixes PR lib/3030).
1997-05-13 22:57:09 +00:00
christos 8259dd08d6 Makefile cleanups:
use INCS variable to install includes and FILES to install objects.
1997-03-24 22:11:48 +00:00
mrg 9cd5492c02 - convert unsafe strcpy(), strcat() and sprintf() to the `n' versions.
- some KNF.
1997-01-23 14:01:45 +00:00
thorpej 7f9ea0f2ed Use ${INSTALL}. 1996-10-18 05:45:01 +00:00
cgd 9118c05a03 RCS ID police: add NetBSD RCS IDs to everything. Since it was imported with
normal RCS IDs apparently unmodified (i.e. they were clobbered), remove
the normal Id tags so they cause fewer conflicts later.
1996-09-13 00:29:49 +00:00
cgd 9867074973 remove this file, since it's not particularly useful since we've removed
most of the files it mentions, and it doesn't really describe the rest.
1996-09-13 00:23:43 +00:00
cgd bd21bf3909 remove some more unused files. 1996-09-12 23:54:37 +00:00
cgd 98a5e78a03 clean up 'make test' so that it works even in the presence of
'obj' dirs, and added minigzip to CLEANFILES.
1996-09-12 22:33:40 +00:00
cgd 5da64b50ae make it into a shared library, too. 1996-09-12 22:23:40 +00:00
gwr 7b1b031b12 We do not use these. 1996-09-12 20:10:50 +00:00
gwr e94c324095 Add a NO_DEFLATE conditional that allows this to be compiled without
reference to the "deflate" compression module.  This can be used to
build a very small zcat for things like install media.  (An example
of such a small zcat may be found in src/distrib/utils/zcat).
1996-09-12 19:50:28 +00:00
gwr 03e6c4e30f We do not use these. 1996-09-12 19:40:30 +00:00
gwr de831ea222 Separate interface from implementation so that zlib.h can be
included without the other, private header files.  Only zlib.h
should be installed in /usr/include; all others are private.
The Makefile has a "test" rule to verify that minigzip.c can
be compiled using only zlib.h (and that it actually works).
Note: This file has extensive modifications.
1996-09-12 19:33:53 +00:00
gwr 4222075279 Eliminate use of things private to the library. 1996-09-12 19:26:44 +00:00
gwr ad91ec121b Fix a "const discarded" warning. 1996-09-12 19:09:00 +00:00
gwr 62a507468c We do not use these. 1996-09-12 19:03:45 +00:00
gwr 431817b1aa Import the "zlib" package (version 1.0.4) as libz
(That appears to be the usual installed name on *nix machines)
1996-09-12 15:33:09 +00:00