The Makefile assumed that builder had '.' in it's path, which is a

security hole for root.  Fix this oversight and clean up the build of
'hack.onames.h' which should be built everytime.

Tested with/without obj directories and .depend files.

Noticed by:	"Christoph P. Kukulies" <kuku@gilberto.physik.rwth-aachen.de>

2 files changed, 6 insertions, 229 deletions

diff --git a/games/hack/Makefile b/games/hack/Makefile
index 037c24b..6824bd5 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -15,11 +15,15 @@ SRCS=	alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 MAN6=	hack.6
 DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
-CFLAGS+= -fwritable-strings
+CFLAGS+= -fwritable-strings -I${.CURDIR} -I.
 HIDEGAME=hidegame
+DPSRCS+= hack.onames.h
+CLEANFILES+= hack.onames.h makedefs
+
+.depend: hack.onames.h
 
 hack.onames.h: makedefs def.objects.h
-	makedefs ${.CURDIR}/def.objects.h > hack.onames.h
+	./makedefs ${.CURDIR}/def.objects.h > hack.onames.h
 
 makedefs: makedefs.c
 	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c
diff --git a/games/hack/hack.onames.h b/games/hack/hack.onames.h
deleted file mode 100644
index c0fe81e..0000000
--- a/games/hack/hack.onames.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#define	STRANGE_OBJECT	0
-#define	AMULET_OF_YENDOR	1
-#define	FOOD_RATION	2
-#define	TRIPE_RATION	3
-#define	PANCAKE	4
-#define	DEAD_LIZARD	5
-#define	FORTUNE_COOKIE	6
-#define	CARROT	7
-#define	TIN	8
-#define	ORANGE	9
-#define	APPLE	10
-#define	PEAR	11
-#define	MELON	12
-#define	BANANA	13
-#define	CANDY_BAR	14
-#define	EGG	15
-#define	CLOVE_OF_GARLIC	16
-#define	LUMP_OF_ROYAL_JELLY	17
-#define	DEAD_HUMAN	18
-#define	DEAD_GIANT_ANT	19
-#define	DEAD_GIANT_BAT	20
-#define	DEAD_CENTAUR	21
-#define	DEAD_DRAGON	22
-#define	DEAD_FLOATING_EYE	23
-#define	DEAD_FREEZING_SPHERE	24
-#define	DEAD_GNOME	25
-#define	DEAD_HOBGOBLIN	26
-#define	DEAD_STALKER	27
-#define	DEAD_JACKAL	28
-#define	DEAD_KOBOLD	29
-#define	DEAD_LEPRECHAUN	30
-#define	DEAD_MIMIC	31
-#define	DEAD_NYMPH	32
-#define	DEAD_ORC	33
-#define	DEAD_PURPLE_WORM	34
-#define	DEAD_QUASIT	35
-#define	DEAD_RUST_MONSTER	36
-#define	DEAD_SNAKE	37
-#define	DEAD_TROLL	38
-#define	DEAD_UMBER_HULK	39
-#define	DEAD_VAMPIRE	40
-#define	DEAD_WRAITH	41
-#define	DEAD_XORN	42
-#define	DEAD_YETI	43
-#define	DEAD_ZOMBIE	44
-#define	DEAD_ACID_BLOB	45
-#define	DEAD_GIANT_BEETLE	46
-#define	DEAD_COCKATRICE	47
-#define	DEAD_DOG	48
-#define	DEAD_ETTIN	49
-#define	DEAD_FOG_CLOUD	50
-#define	DEAD_GELATINOUS_CUBE	51
-#define	DEAD_HOMUNCULUS	52
-#define	DEAD_IMP	53
-#define	DEAD_JAGUAR	54
-#define	DEAD_KILLER_BEE	55
-#define	DEAD_LEOCROTTA	56
-#define	DEAD_MINOTAUR	57
-#define	DEAD_NURSE	58
-#define	DEAD_OWLBEAR	59
-#define	DEAD_PIERCER	60
-#define	DEAD_QUIVERING_BLOB	61
-#define	DEAD_GIANT_RAT	62
-#define	DEAD_GIANT_SCORPION	63
-#define	DEAD_TENGU	64
-#define	DEAD_UNICORN	65
-#define	DEAD_VIOLET_FUNGI	66
-#define	DEAD_LONG_WORM	67
-#define	DEAD_XAN	68
-#define	DEAD_YELLOW_LIGHT	69
-#define	DEAD_ZRUTY	70
-#define	ARROW	71
-#define	SLING_BULLET	72
-#define	CROSSBOW_BOLT	73
-#define	DART	74
-#define	ROCK	75
-#define	BOOMERANG	76
-#define	MACE	77
-#define	AXE	78
-#define	FLAIL	79
-#define	LONG_SWORD	80
-#define	TWO_HANDED_SWORD	81
-#define	DAGGER	82
-#define	WORM_TOOTH	83
-#define	CRYSKNIFE	84
-#define	SPEAR	85
-#define	BOW	86
-#define	SLING	87
-#define	CROSSBOW	88
-#define	WHISTLE	89
-#define	MAGIC_WHISTLE	90
-#define	EXPENSIVE_CAMERA	91
-#define	ICE_BOX	92
-#define	PICK_AXE	93
-#define	CAN_OPENER	94
-#define	HEAVY_IRON_BALL	95
-#define	IRON_CHAIN	96
-#define	ENORMOUS_ROCK	97
-#define	HELMET	98
-#define	PLATE_MAIL	99
-#define	SPLINT_MAIL	100
-#define	BANDED_MAIL	101
-#define	CHAIN_MAIL	102
-#define	SCALE_MAIL	103
-#define	RING_MAIL	104
-#define	STUDDED_LEATHER_ARMOR	105
-#define	LEATHER_ARMOR	106
-#define	ELVEN_CLOAK	107
-#define	SHIELD	108
-#define	PAIR_OF_GLOVES	109
-#define	POT_RESTORE_STRENGTH	110
-#define	POT_BOOZE	111
-#define	POT_INVISIBILITY	112
-#define	POT_FRUIT_JUICE	113
-#define	POT_HEALING	114
-#define	POT_PARALYSIS	115
-#define	POT_MONSTER_DETECTION	116
-#define	POT_OBJECT_DETECTION	117
-#define	POT_SICKNESS	118
-#define	POT_CONFUSION	119
-#define	POT_GAIN_STRENGTH	120
-#define	POT_SPEED	121
-#define	POT_BLINDNESS	122
-#define	POT_GAIN_LEVEL	123
-#define	POT_EXTRA_HEALING	124
-#define	POT_LEVITATION	125
-#define	SCR_MAIL	130
-#define	SCR_ENCHANT_ARMOR	131
-#define	SCR_DESTROY_ARMOR	132
-#define	SCR_CONFUSE_MONSTER	133
-#define	SCR_SCARE_MONSTER	134
-#define	SCR_BLANK_PAPER	135
-#define	SCR_REMOVE_CURSE	136
-#define	SCR_ENCHANT_WEAPON	137
-#define	SCR_DAMAGE_WEAPON	138
-#define	SCR_CREATE_MONSTER	139
-#define	SCR_TAMING	140
-#define	SCR_GENOCIDE	141
-#define	SCR_LIGHT	142
-#define	SCR_TELEPORTATION	143
-#define	SCR_GOLD_DETECTION	144
-#define	SCR_FOOD_DETECTION	145
-#define	SCR_IDENTIFY	146
-#define	SCR_MAGIC_MAPPING	147
-#define	SCR_AMNESIA	148
-#define	SCR_FIRE	149
-#define	SCR_PUNISHMENT	150
-#define	WAN_LIGHT	155
-#define	WAN_SECRET_DOOR_DETECTION	156
-#define	WAN_CREATE_MONSTER	157
-#define	WAN_WISHING	158
-#define	WAN_STRIKING	159
-#define	WAN_SLOW_MONSTER	160
-#define	WAN_SPEED_MONSTER	161
-#define	WAN_UNDEAD_TURNING	162
-#define	WAN_POLYMORPH	163
-#define	WAN_CANCELLATION	164
-#define	WAN_TELEPORTATION	165
-#define	WAN_MAKE_INVISIBLE	166
-#define	WAN_DIGGING	167
-#define	WAN_MAGIC_MISSILE	168
-#define	WAN_FIRE	169
-#define	WAN_SLEEP	170
-#define	WAN_COLD	171
-#define	WAN_DEATH	172
-#define	Adornment	u.uprops[0].p_flgs
-#define	RIN_ADORNMENT	176
-#define	Teleportation	u.uprops[1].p_flgs
-#define	RIN_TELEPORTATION	177
-#define	Regeneration	u.uprops[2].p_flgs
-#define	RIN_REGENERATION	178
-#define	Searching	u.uprops[3].p_flgs
-#define	RIN_SEARCHING	179
-#define	See_invisible	u.uprops[4].p_flgs
-#define	RIN_SEE_INVISIBLE	180
-#define	Stealth	u.uprops[5].p_flgs
-#define	RIN_STEALTH	181
-#define	Levitation	u.uprops[6].p_flgs
-#define	RIN_LEVITATION	182
-#define	Poison_resistance	u.uprops[7].p_flgs
-#define	RIN_POISON_RESISTANCE	183
-#define	Aggravate_monster	u.uprops[8].p_flgs
-#define	RIN_AGGRAVATE_MONSTER	184
-#define	Hunger	u.uprops[9].p_flgs
-#define	RIN_HUNGER	185
-#define	Fire_resistance	u.uprops[10].p_flgs
-#define	RIN_FIRE_RESISTANCE	186
-#define	Cold_resistance	u.uprops[11].p_flgs
-#define	RIN_COLD_RESISTANCE	187
-#define	Protection_from_shape_changers	u.uprops[12].p_flgs
-#define	RIN_PROTECTION_FROM_SHAPE_CHANGERS	188
-#define	Conflict	u.uprops[13].p_flgs
-#define	RIN_CONFLICT	189
-#define	Gain_strength	u.uprops[14].p_flgs
-#define	RIN_GAIN_STRENGTH	190
-#define	Increase_damage	u.uprops[15].p_flgs
-#define	RIN_INCREASE_DAMAGE	191
-#define	Protection	u.uprops[16].p_flgs
-#define	RIN_PROTECTION	192
-#define	Warning	u.uprops[17].p_flgs
-#define	RIN_WARNING	193
-#define	Teleport_control	u.uprops[18].p_flgs
-#define	RIN_TELEPORT_CONTROL	194
-#define	DIAMOND	197
-#define	RUBY	198
-#define	SAPPHIRE	199
-#define	EMERALD	200
-#define	TURQUOISE	201
-#define	AQUAMARINE	202
-#define	TOURMALINE	203
-#define	TOPAZ	204
-#define	OPAL	205
-#define	GARNET	206
-#define	AMETHYST	207
-#define	AGATE	208
-#define	ONYX	209
-#define	JASPER	210
-#define	JADE	211
-/* #define WORTHLESS_PIECE_OF_BLUE_GLASS	212 */
-/* #define WORTHLESS_PIECE_OF_RED_GLASS	213 */
-/* #define WORTHLESS_PIECE_OF_YELLOW_GLASS	214 */
-/* #define WORTHLESS_PIECE_OF_GREEN_GLASS	215 */
-
-#define	CORPSE	DEAD_HUMAN
-#define	LAST_GEM	(JADE+1)
-#define	LAST_RING	19
-#define	NROFOBJECTS	215