From: ian <ian>
Date: Mon, 27 Jun 2005 01:33:59 +0000 (+0000)
Subject: selectors seem to work; makefiles fixed
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=01cdb7290f181520535c734ff235d58680d59e11;p=trains.git

selectors seem to work; makefiles fixed
---

diff --git a/cprogs.make b/cprogs.make
index f9ff7a1..e6fd70c 100644
--- a/cprogs.make
+++ b/cprogs.make
@@ -8,6 +8,6 @@ CFLAGS=	$(CPPFLAGS) -D_GNU_SOURCE \
 CPPFLAGS=
 LINK=		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
 
-%.o:	%.c
+%.o:	%.c $(AUTOINCS)
 	$(CC) $(CFLAGS) -MM $< >$*.d
 	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/hostside/Makefile b/hostside/Makefile
index 8a31acf..1beed99 100644
--- a/hostside/Makefile
+++ b/hostside/Makefile
@@ -1,5 +1,7 @@
 #
 
+AUTOINCS=	layoutinfo.h selectors.h
+
 include ../common.make
 include ../cprogs.make
 
@@ -35,8 +37,6 @@ layoutinfo.h:	../layout/ours.layout-data.c Makefile
 selectors.h:	selectors.h.gen
 		./$< $o
 
-%.c:		layoutinfo.h selectors.h
-
 safety:		safety.o utils.o trackloc.o ../layout/ours.layout-data.o
 		$(LINK)
 
diff --git a/hostside/gui-plan.c b/hostside/gui-plan.c
index 0dc518d..73bdbee 100644
--- a/hostside/gui-plan.c
+++ b/hostside/gui-plan.c
@@ -254,6 +254,7 @@ static void *stdin_ifok(oop_source *evts, oop_read *cl_read,
 
   if (!thiswordstrcmp(&ps,"off")) {
     invert= -1;
+    trainown= 0;
     det= 0;
   } else {
     trainown=