+++ /dev/null
---- makefile.orig 2010-09-07 15:30:17.000000000 -0400
-+++ makefile 2010-09-07 15:31:37.000000000 -0400
-@@ -12,7 +12,8 @@
- OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
- endif
- endif
-- CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
-+ CC := $(CC) -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I . $(CFLAGS)
-+ LIBS = -lm -lrt
- ifeq ($(USE_NETWORK),)
- else
- NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-@@ -274,129 +275,129 @@
- pdp1 : ${BIN}pdp1${EXE}
-
- ${BIN}pdp1${EXE} : ${PDP1} ${SIM}
-- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP1} ${SIM} ${PDP1_OPT} -o $@ $(LIBS)
-
- pdp4 : ${BIN}pdp4${EXE}
-
- ${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
-- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ $(LIBS)
-
- pdp7 : ${BIN}pdp7${EXE}
-
- ${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
-- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ $(LIBS)
-
- pdp8 : ${BIN}pdp8${EXE}
-
- ${BIN}pdp8${EXE} : ${PDP8} ${SIM}
-- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP8} ${SIM} ${PDP8_OPT} -o $@ $(LIBS)
-
- pdp9 : ${BIN}pdp9${EXE}
-
- ${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
-- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ $(LIBS)
-
- pdp15 : ${BIN}pdp15${EXE}
-
- ${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
-- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ $(LIBS)
-
- pdp10 : ${BIN}pdp10${EXE}
-
- ${BIN}pdp10${EXE} : ${PDP10} ${SIM}
-- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP10} ${SIM} ${PDP10_OPT} -o $@ $(LIBS)
-
- pdp11 : ${BIN}pdp11${EXE}
-
- ${BIN}pdp11${EXE} : ${PDP11} ${SIM}
-- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${PDP11} ${SIM} ${PDP11_OPT} -o $@ $(LIBS)
-
- vax : ${BIN}vax${EXE}
-
- ${BIN}vax${EXE} : ${VAX} ${SIM}
-- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${VAX} ${SIM} ${VAX_OPT} -o $@ $(LIBS)
-
- vax780 : ${BIN}vax780${EXE}
-
- ${BIN}vax780${EXE} : ${VAX780} ${SIM}
-- ${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${VAX780} ${SIM} ${VAX780_OPT} -o $@ $(LIBS)
-
- nova : ${BIN}nova${EXE}
-
- ${BIN}nova${EXE} : ${NOVA} ${SIM}
-- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${NOVA} ${SIM} ${NOVA_OPT} -o $@ $(LIBS)
-
- eclipse : ${BIN}eclipse${EXE}
-
- ${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
-- ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ $(LIBS)
-
- h316 : ${BIN}h316${EXE}
-
- ${BIN}h316${EXE} : ${H316} ${SIM}
-- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${H316} ${SIM} ${H316_OPT} -o $@ $(LIBS)
-
- hp2100 : ${BIN}hp2100${EXE}
-
- ${BIN}hp2100${EXE} : ${HP2100} ${SIM}
-- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${HP2100} ${SIM} ${HP2100_OPT} -o $@ $(LIBS)
-
- i1401 : ${BIN}i1401${EXE}
-
- ${BIN}i1401${EXE} : ${I1401} ${SIM}
-- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${I1401} ${SIM} ${I1401_OPT} -o $@ $(LIBS)
-
- i1620 : ${BIN}i1620${EXE}
-
- ${BIN}i1620${EXE} : ${I1620} ${SIM}
-- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${I1620} ${SIM} ${I1620_OPT} -o $@ $(LIBS)
-
- i7094 : ${BIN}i7094${EXE}
-
- ${BIN}i7094${EXE} : ${I7094} ${SIM}
-- ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${I7094} ${SIM} ${I7094_OPT} -o $@ $(LIBS)
-
- ibm1130 : ${BIN}ibm1130${EXE}
-
- ${BIN}ibm1130${EXE} : ${IBM1130}
-- ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ $(LIBS)
-
- s3 : ${BIN}s3${EXE}
-
- ${BIN}s3${EXE} : ${S3} ${SIM}
-- ${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${S3} ${SIM} ${S3_OPT} -o $@ $(LIBS)
-
- altair : ${BIN}altair${EXE}
-
- ${BIN}altair${EXE} : ${ALTAIR} ${SIM}
-- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ $(LIBS)
-
- altairz80 : ${BIN}altairz80${EXE}
-
- ${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM}
-- ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ $(LIBS)
-
- gri : ${BIN}gri${EXE}
-
- ${BIN}gri${EXE} : ${GRI} ${SIM}
-- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${GRI} ${SIM} ${GRI_OPT} -o $@ $(LIBS)
-
- lgp : ${BIN}lgp${EXE}
-
- ${BIN}lgp${EXE} : ${LGP} ${SIM}
-- ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${LGP} ${SIM} ${LGP_OPT} -o $@ $(LIBS)
-
- id16 : ${BIN}id16${EXE}
-
- ${BIN}id16${EXE} : ${ID16} ${SIM}
-- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${ID16} ${SIM} ${ID16_OPT} -o $@ $(LIBS)
-
- id32 : ${BIN}id32${EXE}
-
- ${BIN}id32${EXE} : ${ID32} ${SIM}
-- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${ID32} ${SIM} ${ID32_OPT} -o $@ $(LIBS)
-
- sds : ${BIN}sds${EXE}
-
- ${BIN}sds${EXE} : ${SDS} ${SIM}
-- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
-+ ${CC} $(LDFLAGS) ${SDS} ${SIM} ${SDS_OPT} -o $@ $(LIBS)