Index: /trunk/src/h-basic.h
===================================================================
--- /trunk/src/h-basic.h (revision 153)
+++ /trunk/src/h-basic.h (revision 164)
@@ -193,6 +193,6 @@
   typedef int32_t s32b;
 
-#define MAX_UCHAR		INT8_MAX
-#define MAX_SHORT		SINT16_MAX
+#define MAX_UCHAR		UINT8_MAX
+#define MAX_SHORT		INT16_MAX
 
 #else /* __STDC__ */
Index: /trunk/src/Makefile
===================================================================
--- /trunk/src/Makefile (revision 82)
+++ /trunk/src/Makefile (revision 164)
@@ -6,6 +6,6 @@
 include Makefile.src
 HEADERS = $(HDRS) $(INCS)
-SOURCES = $(addsuffix .c,$(ANGFILES) $(MAINFILES) $(ZFILES))
-OBJECTS = $(addsuffix .o,$(ANGFILES) $(MAINFILES) $(ZFILES))
+OBJECTS = $(ANGFILES) $(MAINFILES) $(ZFILES)
+SOURCES = ${FILES:.o=.c}
 
 # These are for OS-specific ports; ignore 'em until we use autoconf everywhere.
Index: /trunk/src/Makefile.inc
===================================================================
--- /trunk/src/Makefile.inc (revision 87)
+++ /trunk/src/Makefile.inc (revision 164)
@@ -7,6 +7,6 @@
 include Makefile.src
 
-BASEOBJS := $(addsuffix $(OBJEXT), $(ANGFILES))
-ZOBJS := $(addsuffix $(OBJEXT), $(ZFILES))
+BASEOBJS := ${ANGFILES:.o=$(OBJEXT)}
+ZOBJS := ${ZFILES:.o=$(OBJEXT)}
 
 
Index: /trunk/src/Makefile.src
===================================================================
--- /trunk/src/Makefile.src (revision 141)
+++ /trunk/src/Makefile.src (revision 164)
@@ -12,49 +12,49 @@
 HEADERS = $(HDRS) $(INCS)
 
-ZFILES = z-file z-form z-rand z-term z-type z-util z-virt
-MAINFILES = main maid-x11 main-crb main-gcu main-gtk main-ros main-sdl \
-            main-win main-x11 main-xaw snd-sdl
+ZFILES = z-file.o z-form.o z-rand.o z-term.o z-type.o z-util.o z-virt.o
+MAINFILES = main.o maid-x11.o main-crb.o main-gcu.o main-gtk.o \
+	main-ros.o main-sdl.o main-win.o main-x11.o main-xaw.o snd-sdl.o
 
 ANGFILES = \
-	birth \
-	cave \
-	cmd0 \
-	cmd1 \
-	cmd2 \
-	cmd3 \
-	cmd4 \
-	cmd5 \
-	cmd6 \
-	dungeon \
-	files \
-	generate \
-	init1 \
-	init2 \
-	load \
-	melee1 \
-	melee2 \
-	monster1 \
-	monster2 \
-	obj-info \
-	object1 \
-	object2 \
-	randart \
-	randname \
-	pathfind \
-	save \
-	spells1 \
-	spells2 \
-	squelch \
-	store \
-	tables \
-	ui \
-	use-obj  \
-	util  \
-	variable \
-	wizard1 \
-	wizard2 \
-	x-spell \
-	xtra1 \
-	xtra2
+	birth.o \
+	cave.o \
+	cmd0.o \
+	cmd1.o \
+	cmd2.o \
+	cmd3.o \
+	cmd4.o \
+	cmd5.o \
+	cmd6.o \
+	dungeon.o \
+	files.o \
+	generate.o \
+	init1.o \
+	init2.o \
+	load.o \
+	melee1.o \
+	melee2.o \
+	monster1.o \
+	monster2.o \
+	obj-info.o \
+	object1.o \
+	object2.o \
+	randart.o \
+	randname.o \
+	pathfind.o \
+	save.o \
+	spells1.o \
+	spells2.o \
+	squelch.o \
+	store.o \
+	tables.o \
+	ui.o \
+	use-obj.o  \
+	util.o  \
+	variable.o \
+	wizard1.o \
+	wizard2.o \
+	x-spell.o \
+	xtra1.o \
+	xtra2.o
 
 
Index: /unk/aclocal.m4
===================================================================
--- /trunk/aclocal.m4 (revision 159)
+++  (revision )
@@ -1,14 +1,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include([acinclude.m4])