Commit graph

75 commits

Author SHA1 Message Date
d702068457 Fix trailing whitespace 2008-09-17 21:31:40 -04:00
d72f9936db Fix remaking of sources.mk with git
Broken since commit 35db407d, v.4.3.12.  v4.3.14 and v4.3.15 were
distributed with a stale sources.mk in the tarball.  The latter does
not build out of the box because of that.
2008-07-25 08:34:35 -04:00
231947e41a Fix make distclean to remove generated sources.mk 2008-03-14 20:25:44 +01:00
0dd6702df1 Update known contributors comments 2008-03-14 20:25:44 +01:00
7ec0f0c0d0 New utility program empdump
empdump exports and imports game state as plain text.  Limitations: it
currently can't export player bmaps, power report, telegrams,
announcements, message of the day, no-login message and log files.
Exported floating-point values may be inexact.  Importing an exported
game state may not result in identical data files; besides the loss of
floating-point precision just mentioned, coordinates are normalized,
and characters beyond a string's terminating zero in a character array
are lost.  Bug: importing resets timestamps to zero.  It should set
them to the current time.
2008-03-14 20:25:42 +01:00
b3c5ba2f75 Tighten gcc warning options
Suppress only unused parameters, not all unused stuff.
2008-03-14 20:25:38 +01:00
adbcdf4335 Clean up dependencies after failed compile
If gcc's preprocessor chokes, it leaves an empty dependency file
behind, and doesn't touch the object file.  If an old object file
exists, and is newer than the .c file, make will then consider the
object file up-to-date.  This can lead to nasty version errors.
2008-03-14 20:25:09 +01:00
77e95bd788 Clean up library dependencies
Move stuff to untangle the ugly cyclic dependencies between the
archives built for selected subdirectories of src/lib/:

* Move common/io.c to empthread/ because it requires empthread stuff

* Move parts of subs/nstr.c to common/nstreval.c to satisfy
  common/ef_verify.o

* Move getstarg.c getstring.c onearg.c from gen/ to subs/ because they
  require stuff from there

* Move bridgefall.c check.c damage.c empobj.c journal.c maps.c
  sectdamage.c from common/ to subs/ because they require stuff from
  there

* Move cnumb.c from subs/ to common/ to satisfy common/type.o

* Move log.c fsize.c from common/ to gen/ because they really belong
  there

* Move emp_config.c mapdist.c from gen/ to common/ because they really
  belong there, and require stuff from libglobal.a

Also package as/ as libas.a to satisfy common/path.o.

Remaining dependencies:

    lib             needs
    --------------------------------------------
    libas.a         libglobal.a
    libcommon.a     libas.a libglobal.a libgen.a
    libgen.a
    libglobal.a
    liblwp.a        libgen.a
    libw32.a[*]     libgen.a

    [*] Except for service.o, which can only be linked into the server

Link order now: liblwp.a libcommon.a libas.a libgen.a libglobal.a
libw32.a.  The position of libw32.a is not quite right, but works
anyway.
2008-02-03 08:11:13 +01:00
db02dda32f Update copyright notice 2008-01-19 10:15:37 +01:00
35db407da0 Convert the build process from CVS to git
Detect .git instead of CVS.  Use git-ls-files with git, else
$(srcdir)/sources.mk.  info/findsubj.pl now gets the info files as
arguments rather than from sources.mk.

Remaking info subjects doesn't quite work, but it was broken similarly
before.
2008-01-13 11:17:26 +01:00
13a465edca Fix the previous revision. 2007-12-22 07:57:07 +00:00
Ron Koenderink
f082ef9fa6 (w32_getpw, w32_socket, w32_connect, w32_recv, w32_send,
w32_writev_socket, w32_close_socket, getpass, w32_openfd,
w32_openhandle, w32_readv_handle, w32_close_handle,
sysdep_init, sysdep_stdin_init, w32_select, w32_signal_handler,
sigaction, stdin_read_thread, w32_ring_from_file_to_bounce_buf)
[_WIN32]: New w32 equivalent functions for POSIX functions.
(recvline, sendcmd, tcp_connect, hostconnect, getpass,
main, intr, play, ring_to_file, ring_from_file, doexecute,
doredir) [_WIN32]: Use new WIN32 equivalent functions.
(main) [_WIN32]: Add sysdep_init() to support system dependent
initialization for equivalence functions.
(play) [_WIN32]: Add sysdef_stdin_init() to support system
dependent initialization for reading stdin.
(recv_input, play) [_WIN32]: Replace the calls to ring_to_file()
and select() with WIN32 specific enhanced versions.

Makefile.in: update dependencies with new files.
Make.mk: Add using of getopt.c and getopt.h
from src/lib/w32 directory.  Add getopt.c and getopt.h
to tar for client.
2007-12-11 22:00:25 +00:00
46c0410e9c (main): Rewrite argument parsing to use getopt(). New options -h and
-v.
(print_usage): New.
2007-11-16 20:33:08 +00:00
f757843ca5 (install): Be a bit more verbose about the update of econfig.
(uninstall): Point to the unremoved configuration directory, not just
to econfig.
2007-11-16 19:23:30 +00:00
535c8a06a7 (tarball): Fix missing -e required by shell script. 2007-11-15 07:11:15 +00:00
e7c9ca1186 (info.html/all.html): Fix to use the full 80 columns for the table.
(info.nr/all): Fix race between ls and output redirection.
2007-08-08 06:15:33 +00:00
6e3da4e1d0 Moving getopt.h to src/lib/w32/ broke the Windows build. Fix. 2007-08-08 05:27:49 +00:00
6498d66263 New home for stuff specific to Windows: src/lib/w32/
Move getopt.c getopt.h service.c from src/lib/gen/ there.
(lib/libw32.a): New.
(libs): Add it under Windows.
2007-08-04 05:23:39 +00:00
2c9b1ee80b (subst.in): Polish substitution of @configure_input@. 2007-07-28 19:33:35 +00:00
62c8eea544 Remove the ancient, crufty non-UCONTEXT system-dependent LWP code.
Using it required manual hackery since 4.3.0, and it hasn't been
missed.
2007-07-28 13:58:58 +00:00
f915f91b47 Update known contributors comment. 2007-07-27 20:16:19 +00:00
c1a0a42024 (util): Add empsched, belatedly. 2007-07-16 19:39:23 +00:00
27db04027e (schedule): New.
(install): Install a default schedule.
2007-07-11 22:37:31 +00:00
8da8e3fb3a Some variables were recursively expanded unintentionally. Fix. 2007-07-11 19:52:24 +00:00
530deef2fe Install all manual pages in section 6, where they belong. Source
files renamed.
2007-07-11 19:45:28 +00:00
63bdc89835 Update copyright notice. 2007-01-09 19:09:31 +00:00
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