Commit Graph

173 Commits

Author SHA1 Message Date
Bruce Evans
1c9df6b435 Don't build dependencies unless NOCLEAN is set. This speeds up
`make world' by about 14% here (down to 4490 seconds real on a
K6/233).  Temporarily skip this optimization when building with
-j, since there are still many broken makefiles.

Fixed NOCLEANDIR option.  Cleaning of `.depend' was broken.

Put -nostdinc in CFLAGS, not in CC, and don't override the default
CC.  This fixes enforcing use of ${WORLDTMP}/usr/include.

Don't install library man pages in ${WORLDTMP}.
1998-04-27 16:21:33 +00:00
Jordan K. Hubbard
29c03682fa Use more reasonable defaults for SUP variables (and print them
correctly) now that sup is long since dead and buried.
1998-04-26 08:40:25 +00:00
Andreas Klemm
3f99ca5351 make includes has to execute "make beforeinstall" in src/lib/libcalendar
as well, otherwise "make depend" during "make buildworld" fails in
usr.bin/ncal
1998-04-25 14:32:22 +00:00
Bruce Evans
29844c8f14 Don't build shared libraries twice for `make world'. This reduces
`make world' times by about 10%.  Use a new `bootstrap-libraries'
target to build just enough (static) libraries to bootstrap the
tools, and delay building of shared libraries until all the tools
have been built.

Fixed `/usr/bin/make world'.  The version of `make' that we buildis
nand use is named "make", not ${MAKE}.
1998-04-24 17:13:33 +00:00
Dmitrij Tejblum
878739de43 Cosmetic: put '@' in front of a very long command. 1998-04-19 13:44:52 +00:00
Mark Murray
5019f318e8 Make the decision to compile kerberosIV a bit more secure by looking
for the appropriate directory.
1998-03-26 17:32:24 +00:00
Bruce Evans
47e0b716cb Build the initial `make' in the temporary build tree so that its forced
cleaning doesn't affect the normal copy.  Save a little time by not doing
unnecessary clean, depend nd cleandepend steps.

Reviewed by:	mckay@freebsd.org

Added xargs to build-tools.  It may be used for kdump and truss.
1998-03-19 16:43:19 +00:00
Bruce Evans
279e998173 Restored an (apparently unnecessary) -B for installing lib-tools.
The install target is -j-unsafe in general, so we use -B for
installing everything in `make world'.
1998-03-16 11:58:46 +00:00
Bruce Evans
42fce6372e Don't force NOPIC for building tools at all for now, so that some
(slightly stale) shared libraries get installed before non-tools
are linked.  The 2-stage build of the libraries has never really
worked, since we link to the libraries built in the first stage.
1998-03-15 04:52:58 +00:00
Bruce Evans
ff85458032 Don't force NOPIC or NOSHARED for building tools in the NOCLEAN case,
so that dirtier-than-previously tools aren't left lying around to be
installed.

Filter out NOPIC from ${MK_FLAGS} for `make ${OBJDIR}' for ld (and
some other things), so that the obj dir for ld/rtld always gets
re-made.

Fixed a literal "make".
1998-03-14 13:58:21 +00:00
Bruce Evans
13a8a44971 Build all tools shared, and don't build any shared libraries for tools.
Build libraries (for linking the tools to) in a more correct order
(for linking freshly created shared libraries to each other).  This
is probably a no-op now that shared libraries for tools aren't
built, but I didn't test any intermediate versions.  Security-related
directories that are not built by default may now be misordered
for the shared case.

Don't build libcompat specially.  It isn't used for tools, and
shouldn't be used in /usr/src (it is only used for IPXrouted and
crufty games).

Added missing ${.CURDIR} to existence tests for library directories.
Existence tests for top-level directories are still broken.

Test for library directories actually being built, not for directories
above them.
1998-03-13 09:41:58 +00:00
Bruce Evans
4a9d3efb86 compile_et is now used early to build includes for libss, so build it
earlier.  This is probably unnecessary.

Added now-necessary -B for installing headers for libss.

Removed now-unnecessary -B for building cleandepend for rpcgen.
1998-03-12 13:19:59 +00:00
Bruce Evans
228e718f7c Fixed missing SHLIBDIR in GCC_EXEC_PREFIX.
Add the path to the source .mk files to the beginning of .MAKEFLAGS
instead of to the end, so that there is more chance of it having
priority.  Additions in /etc/make.conf still have priority for
sub-makes if they are also at the beginning, although this is
probably not wanted for building /usr/src.

Use ${MK_FLAGS} for building dependencies for tools.  This saves
time building dependencies for tools that won't be created (mainly
profiled libraries) and will be necessary to give correct dependencies
when tools are built static.

Spell the object directory as ${OBJDIR} consistently (even when we know
that ${OBJDIR} == "obj").

Print ${DESTDIR} in messages where appropriate.

Fixed some misformattings.
1998-03-12 10:55:02 +00:00
Bruce Evans
46986e6888 Separated header creation from header installation in libss. Create
the libss headers before installing them in `make world'.
1998-03-12 10:08:50 +00:00
John Birrell
b97da42349 Change the bootstrap makefile inclusion to be general based on the
MACHINE. This lets me play with porting to m68k too. 8-) That is a
good test for portability because MACHINE != MACHINE_ARCH and m68k is
big endian.
1998-02-19 07:34:46 +00:00
Nate Williams
165932dd78 MF22:
- After the install has been done, but before makedb is run, run
  'ldconfig -R' to pick up new shlib dependencies.

Suggested by:   Amancio and a whole lot of other folks
1998-02-19 00:24:43 +00:00
Adam David
dbf1ec592e -DNOTOOLS to not rebuild any tools during buildworld 1998-02-06 09:52:34 +00:00
John Birrell
cf763a57d2 Test for ${MACHINE} == "alpha" and include the bootstrap makefile instead
of doing the normal build. When the alpha bootstrap is complete (there
is more work to do!), the alpha will build like the i386 does now.
I changed i386 references to ${MACHINE} now that we're multi-architecture.
1998-01-11 04:51:02 +00:00
Satoshi Asami
68cd0c9acc Do not use -B in initial build of "make". It doesn't exist in 2.1.x.
Instead, list the targets one per command line.

Reviewed by:	bde
Submitted by:	bde (part)
1997-10-10 13:02:36 +00:00
Bruce Evans
ff2daf7bfc Removed uneeded ${.MAKEFLAGS} again.
Originally committed in: rev.1.141
Spammed by:	rev.1.149 (mouldy parallel make diffs)
1997-10-07 11:32:05 +00:00
Jordan K. Hubbard
39245839f5 Having to review all changes to this file _very_ carefully
led me to find 2 more errors which were there before. :)
1997-10-06 10:21:36 +00:00
Jordan K. Hubbard
191ae5bcf8 Hooboy!
Did I ever spam this file good with that last commit.  Despite 3
reviewers, we still managed to revoke the eBones fixes, TCL 8.0 support,
libvgl and a host of other new things from this file in the process of
parallelizing the Makefile.  DOH!   I think we need more pointy hats - this
particular incident is worthy of a small children's birthday party's worth of
pointy hats. ;-)

I certainly intend to take more care with the processing of aged diffs
in the future, even if it does mean reading through 20K's worth of them.
I might also be a bit more anal about asking for more up-to-date changes
before looking at them. ;)
1997-10-06 09:58:11 +00:00
Steve Passe
2c545ac503 Removed redundant 'all' arg to " Making Make" target.
Removed "-r RELENG_2_2" from 'update' target.
1997-10-05 22:28:50 +00:00
Mark Murray
4a3b1f84ff How the heck did this get back?? 1997-10-05 15:39:47 +00:00
Jordan K. Hubbard
97fe7f477f Changes to support full make parallelism (-j<n>) in the world
target.
Reviewed by:	<many different folks>
Submitted by:	Nickolay N. Dudorov" <nnd@nnd.itfs.nsk.su>
1997-10-05 09:40:24 +00:00
Stephen McKay
1e1ff62149 When bootstrapping lex, the object directory for lex/lib would be deleted
without being recreated.  A read-only source compile would then fail shortly
afterwards trying to write .depend into the source tree.
1997-09-28 16:25:28 +00:00
Mark Murray
542552a46c Change for KTH KerberosIV.
-DMAKE_EBONES is changed to -DMAKE_KERBEROS4
1997-09-28 09:26:05 +00:00
Jordan K. Hubbard
c09eac88f0 When making make, do cleandir *before* objdir or we'll end
up with a blown objdir for the depend stage, leaving the
.depend file in ${SRCDIR} instead.
1997-09-26 09:31:41 +00:00
Bruce Evans
d7f4fc69b4 Backed out rev.1.136 and rev.1.144. Force SHARED=symlinks in a different
way - for buildworld only.

Rev.1.136 broke the (deprecated) external includes target.  Rev.1.144 was
a half-baked backout of rev.1.136.  It broke SHARED=symlinks for the
buildworld target and installation of subdirs of src/include for the
includes target.
1997-09-16 10:45:41 +00:00
Rodney W. Grimes
825cbd5821 When calling the src/include Makefile use the shorthand ``all beforeinstall''
inplace of ``all installhdrs symlinks'' so those of us who run with
SHARED=copies get the right results.
1997-09-15 05:58:50 +00:00
Peter Wemm
a13c81d8e4 Back out use of -m, since 2.1.x apparently do not have it. (sigh..) 1997-09-05 09:11:24 +00:00
Peter Wemm
cf68c4fbd8 Fix the ${BINFORMAT} definition problem during 'make {build}world'. The
wrong switches were being passed to 'make' that caused sys.mk to come from
the /usr/share/mk location but the bsd.*.mk files to come from the
source tree in src/share/mk.  This was bound to break sooner or later.

Submitted by:	Dmitrij Tejblum <dima@tejblum.dnttm.rssi.ru>
1997-08-31 21:06:40 +00:00
Peter Wemm
c2f5ca64d3 Remove unneeded ${.MAKEFLAGS} being explicitly passed on via the command
line..

PR:  4368
1997-08-26 14:15:25 +00:00
Bruce Evans
5c2de1d703 Use new installhdrs target to install tcl includes. 1997-08-25 19:40:53 +00:00
Bruce Evans
a98622df6d Added directories in the includes target so that it installs
everything that a full install would (modulo bugs in rpcsvc/Makefile).
The missing things weren't used (except for mp.h from libmp), but
there are relatively few of them and it's easier to be complete.
1997-08-21 15:43:54 +00:00
Bruce Evans
912dc4f0ba Restored rev.1.122, which was clobbered by copying from -stable in
rev.1.134.

Split long lines.
1997-08-21 15:16:07 +00:00
Peter Wemm
dfd35b6576 Pass command line args to 'buildworld' and 'installworld' etc. Otherwise
'make -DNOCLEAN world' is completely ignored.
1997-08-18 06:54:18 +00:00
Peter Wemm
1dd53538bc In the includes target, call the header install target explicitly and then
call the 'symlinks' target to build the /usr/obj/tmp/install/sys tree since
In the includes target, call the header install target explicitly and then
call the 'symlinks' target to build the /usr/obj/tmp/install/sys tree since
we set this up manually earlier, and if we do a 'make all install', we
replace the symlink tree in the obj dirs with new copies of the files
which breaks any chance of -DNOCLEAN working.
1997-08-18 06:44:44 +00:00
Andreas Klemm
3dfd5a6295 fix a make world problem.
updated beforeinstall target.
mp.h from gnu/lib/libgmp.h has to be installed to /usr/include
so that usr.bin/chkey and usr.bin/newkey can be compiled.
1997-08-17 21:14:22 +00:00
Satoshi Asami
f9998d9b90 Merge from -stable; NOTCL hook in beforeinstall. 1997-08-12 10:12:56 +00:00
Satoshi Asami
2799473b0c Merge buildworld/installworld patch to Makefile from RELENG_2_2. Patch
a couple *.mk files to enable -current world building on really old
machines (e.g., 2.1.5).

Reviewed by:	too many many people to list here, special thanks to bde
1997-08-05 03:49:49 +00:00
Satoshi Asami
4460c39e86 More whitespace/tab fixes.
Submitted by:	bde
1997-07-31 08:31:50 +00:00
Satoshi Asami
caaf2b4b9a Consistently use tabs in the leading comments.
Submitted by:	bde (yes, I'm serious)
1997-07-31 08:06:29 +00:00
John Fieber
436821e9a2 Remove sgml stuff from the build-tools target. It is no longer used
in a make world.
1997-06-08 15:04:06 +00:00
John Hay
89780415d4 Add libmp and libz to the includes target. This makes "make includes -DCLOBBER;
make depend; make all" work. I think there should be a better than adding
each library directory here.
1997-06-08 14:03:23 +00:00
Peter Wemm
1b87a2d536 make beforeinstall in libalias from the includes target 1997-05-26 05:27:37 +00:00
Satoshi Asami
5c49694977 Fix comment about LOCAL_DIRS. Now it works as advertised. :) 1997-05-21 22:48:51 +00:00
Jordan K. Hubbard
d50204c1b0 Remove evil MAKE_LOCAL and MAKE_PORTS hacks and replace them with
a simpler, more general LOCAL_DIRS hack.
Reviewed by:	asami
1997-05-21 19:41:16 +00:00
Peter Wemm
62eb403e46 Forgot to commit this.. Do a 'make all' in src/include before trying
to install it.  Otherwise osreldate.h breaks.

Pointed out by:  Doug Rabson <dfr@nlsystems.com>
1997-05-13 18:11:38 +00:00
Bruce Evans
b02cab92aa Use `mk' files in share/mk (relative to the top level of the source
tree) instead of the system default ones in /usr/share/mk.  This
only works for makes run from the top level, and a few not too out
of date system makefiles must be present to start up.  Bootstraps
from can still be done from scratch by giving the path to an up to
date share/mk on the command line.

Removed bootstrap `mk' target and use of it.  The bootstrap didn't
actually work for the non-null DESTDIR case.
1997-05-10 06:53:40 +00:00