chiark
/
gitweb
/
~ijackson
/
trains.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3b6a64
)
selectors seem to work; makefiles fixed
author
ian
<ian>
Mon, 27 Jun 2005 01:33:59 +0000
(
01:33
+0000)
committer
ian
<ian>
Mon, 27 Jun 2005 01:33:59 +0000
(
01:33
+0000)
cprogs.make
patch
|
blob
|
history
hostside/Makefile
patch
|
blob
|
history
hostside/gui-plan.c
patch
|
blob
|
history
diff --git
a/cprogs.make
b/cprogs.make
index f9ff7a166d142bcc5a2a75c1645971939813a1eb..e6fd70cd360aad6f777278cd628809ad5b1ec8cd 100644
(file)
--- 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 8a31acf39511cf1d09ccf8d486fc4cd4b6e94ea5..1beed99740fbd13c5d542c7256d904f776959f0e 100644
(file)
--- 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 0dc518d8159baf6132571bd0dbff82b57e819fc3..73bdbeef5cbb79a7f0572adecc4f875499bdd694 100644
(file)
--- 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=