Commit graph

49 commits

Author SHA1 Message Date
aeff93394e Fix the previous revision again. 2006-06-18 20:45:01 +00:00
3d0f7dd383 Fix the previous revision. 2006-06-18 20:31:41 +00:00
1c7cdbaad9 (install): Create a clean econfig.new when the one found at the
destination doesn't work.
2006-06-18 19:11:49 +00:00
9067d7a453 (info.ps): New. Adapt TROFF.MAC. Result isn't exactly a readable
book.
2006-06-16 20:51:40 +00:00
32e4fbd284 Move signal stuff into src/lib/empthread/, no functional change:
(empth_init_signals): New, factored out of start_server().  Call from
empth_init().
(panic): Move to posix.c, internal linkage.
(empth_obj): Add new posix.o

(empth_start, empth_alarm) [EMPTH_POSIX]: Clean up pointless messing
with signal handlers.
(empth_init, empth_wakeup) [EMPTH_POSIX]: Clean up a bit.
2006-06-05 08:51:02 +00:00
56181c1986 The previous revision of Make.mk didn't work with separate build
trees.  Do it in a way that does.
2006-05-25 08:18:20 +00:00
b01382cdcc Don't use -I with $(NROFF), old versions of groff and traditional
nroff don't support it.
2006-05-24 19:55:05 +00:00
bed456eb10 (info.nr/all, info.html/all.html, sources.mk): Pass LC_ALL=C in the
environment to make output independent of user's locale.
2006-04-26 19:08:17 +00:00
9de0841ca0 (sources.mk): Sort file names to make output deterministic. 2006-04-26 18:13:25 +00:00
8daf5fce01 Use touch to touch stamp files, > doesn't update mtime of existing
file on some systems.  Weird.
2006-03-09 21:21:58 +00:00
1e44434b5c (client): Don't make $(termlib) a prerequisite, pass it in $(LDLIBS).
The old version didn't work on some systems.
2006-03-09 20:58:36 +00:00
13421c7c0e MSYS ships an obsolete version of GNU make which doesn't grok
order-only prerequisites.  They were used to make directories
info.html, info.nr, lib.  Make them ahead of time, in configure.  Also
fixes distclean not removing them.
2006-03-04 21:18:15 +00:00
3597934c40 (sources.mk): Avoid harmless circular dependency. 2006-02-26 08:29:12 +00:00
c9f530846e (uninstall): Implement. 2006-02-19 17:19:16 +00:00
99c533fef7 Fix the previous revision. 2006-02-19 09:21:21 +00:00
b4161cd7e2 (mchr, plchr, lchr, nchr): Move initializer to new builtin config
files ship.config, plane.config, land.config, nuke.config.
(empfile): Declare the new config files.
(install, installdirs): Install them.
(builtins): New make variable.
2006-02-19 09:15:46 +00:00
9a30f30107 (builtindir): New econfig key, variable and make variable.
(subst.in): Substitute it.  Fix prerequisites.
(read_builtin_tables): New.
(main): Call it.  This doesn't do anything, because no builtin tables
have been defined.
2006-02-19 07:04:30 +00:00
5282f500b5 (datadir, edatadir, gamedir): Rename to avoid confusion with Autoconf
output variable datadir and with configuration data.
2006-02-18 09:16:50 +00:00
78578a0521 (info.nr/all, info.html/all.html): Don't pass -F to ls, it has no
effect here.  Was mindlessly copied from old info/Makefile.
2006-02-15 07:35:32 +00:00
5109a30910 (vers): Don't report KSU distribution (1.04 in all known versions),
Chainsaw version (4.00 since Empire 2, ca. 1995) and Wolfpack version
(used to be the version number after the first dot).
(KSU_DIST, CHAINSAW_DIST, WOLFPACK_DIST): Unused, remove.

(version): New.
(EMP_VERS_MAJOR, EMP_VERS_MINOR, EMP_VERS_PATCH): Remove.  Users
changed to use version[] instead.  version[] is slightly easier to
initialize from configure.ac.
(check-version): No longer needed, remove.

(legal): New.
(vers, main): Show it.
2006-01-27 17:59:06 +00:00
14250e3cbc Cosmetics. 2006-01-26 18:44:39 +00:00
d8480865ae (info.nr/all, info.html/all.html): Don't pick up random junk from the
filesystem.
2006-01-23 21:33:13 +00:00
2e7c9edf5e (sources.mk): Link from $(srcdir) if compiling from tarball. Why?
It's distributed in $(srcdir), but required in build directory.

(distclean, bld_distgen): Don't distribute subjects.mk, it's not being
used with a separate build tree.
2006-01-23 21:14:53 +00:00
c0aeefd865 (ac): Add file that should have been added in rev. 1.24. 2006-01-23 20:47:25 +00:00
0219f68bd8 (check-version): Didn't work with separate build tree. 2006-01-22 22:18:25 +00:00
fd16db1565 (dist-client): Tarball missed files. Fix.
(dist-source, dist-client): Prerequisites were missing.
(acdistcli, cli_distgen, src/client/configure, src/client/config.h.in)
(src/client/aclocal.m4): New.
2006-01-22 22:02:23 +00:00
58bc018b53 (dist-client): Get rid of unwanted subdirectory src/client.
(dist-client): Add include/proto.h and man/empire.6.
2006-01-22 16:07:09 +00:00
4515b84c59 COPYING duplicates information from README. Remove. Move GPL from
LICENSE to COPYING, because that's where it usually is.  Update all
the references to these files.
2006-01-21 19:48:41 +00:00
23726b3799 (CFLAGS): Recent versions of gcc have a built-in function carg(),
which collides with our carg().  Suppress.
2006-01-21 08:06:17 +00:00
ed6514f7f3 Work around MinGW Make's broken built-in link rule. 2006-01-20 07:48:10 +00:00
1991652cfd (dist): Implement. The client tarball doesn't work yet.
(TARNAME, VERSION, tarball, acdist, src_distgen, bld_distgen)
(dist-source, dist-client, dist-info, check-version): New.
2006-01-15 20:10:27 +00:00
f237a5e278 (ac): Fix location of autom4te.cache.
(clean): Add missing $(empth_obj).
2006-01-15 19:49:56 +00:00
987a1bac4a (info.html/TOP.html): Fix. 2006-01-15 18:19:27 +00:00
0280a43950 Reorder variable definitions. No functional changes. 2006-01-15 18:15:50 +00:00
99975ef076 (EXEEXT): New.
(util, client, server): Use it.
2006-01-15 18:07:58 +00:00
441c314f1e (distclean): Clean up another rev. 1.11 leftover. 2006-01-15 18:02:01 +00:00
aa35988ec8 (distclean): Clean up rev. 1.11 leftover. 2006-01-15 12:57:49 +00:00
5064c5425f (subjects.mk): Didn't work when info sources were deleted. 2006-01-05 14:13:56 +00:00
2f14064a25 Split info.pl into findsubj.pl, mksubj.pl, mktop.pl. 2006-01-05 13:40:19 +00:00
3e400c018c Update copyright notice. 2006-01-05 13:36:57 +00:00
69150d10fc (EMPTH_LWP, EMPTH_POSIX, EMPTH_W32): Define in config.h instead of
compiler command line.  Don't bother to conditionalize code in .c
files that are only compiled when their thread package is used.

(_EMPTH_LWP, EMPTH_LWP, _EMPTH_POSIX, EMPTH_POSIX, _EMPTH_WIN32)
(EMPTH_W32): Identifiers beginning with an underscore and an uppercase
letter are reserved for any use.  Rename.
2005-12-28 14:27:15 +00:00
a626ecc888 Fix rev. 1.4. 2005-12-24 14:36:41 +00:00
eb1134541a (CPPFLAGS): Add -I., to find config.h. Remove -Iinclude, it's unused. 2005-12-23 18:47:41 +00:00
90def7cb85 (install, install-html): Implement. Closes #913154.
(installdirs): New.
2005-12-23 17:58:19 +00:00
1bf21d048a (info): TOP was missing. 2005-12-23 17:53:28 +00:00
874bb3348a Fix rev. 1.1 for how_to_dep = depcomp. 2005-12-23 09:06:29 +00:00
7b507bd1d5 Fix the previous revision. 2005-12-22 21:28:37 +00:00
4ea4a01fd5 (info, html): Implement.
(all): Depend on info.

Flatten info directory.  This undoes the move to one subdirectory per
chapter, which was done during Empire 2.  The structure doesn't buy us
much, as the info name space is flat, and it complicates makefiles.

Overhaul info.pl:
- It now wants to run in the root of the build tree.
- Information on source files and subjects is now stored in makefiles,
  thus info.pl no longer picks up random junk from the file system.
- Clean up Perl anachronisms, in particular use subroutine arguments and
  results rather than global variables where convenient.
- Change format of diagnostics to the common format used by GNU tools,
  so that Emacs and the like can parse it.
- Catch missing .SA.
- When creating a new subject file, cowardly refuse to overwrite an
  existing file.
- Subject files contain topics sorted by chapter, then by name.  The
  order of chapters used to depend on how Perl sorts hash keys.  Fix
  it.
2005-12-22 10:09:17 +00:00
a98626df2d Replace the build process. The new one requires GNU Make, Autoconf
and Autoconf macros that come with Automake.  It supports multiple
separate builds of the same source tree, and updates dependencies
automatically.  Targets info, html, install, install-html, uninstall
and dist are not yet implemented.

System configuration is now automatic.  Previously, you had to choose
one of several canned system configurations, defined in Make.sysdefs.
Currently, system configuration always uses UCONTEXT for LWP, and
chooses LWP only if its requirements are met.

Feature configuration changed: instead of editing build.conf (further
processed by doconfig), you pass arguments to configure.  Note that
build.conf settings that can be overridden in econfig have no
configure equivalent; just edit econfig instead.

Because generated headers complicate makefiles, fold gamesdef.h into
its users: path.c and ipglob.c become path.c.in and ipglob.c.in,
constants.c, vers.c, options.h simply hardcode defaults (most of them
are run-time configurable).

Call the client empire instead of emp_client.  This matches what the
old standalone build did.
2005-12-20 20:25:35 +00:00