I've updated the Makefile diff to fix a couple of things and to allow
individual simulators to be linted.
After applying the diff, you can lint individual simulators by saying,
for example:
make lint-pdp11 BIN=lint-
Or you can lint everything with just "make lint".
The changes are in the attached file "DIFF". They can be applied to a
makefile from wednesday's github master branch via
patch makefile< DIFF.
If your makefile contains carriage returns as well as newlines, you'll
need to run:
tr -d \\r< makefile
first, otherwise you'll get six "hunk failed" messages.
If you have a different makefile version, it's not hard to update by
hand as there are only six hunks in the diff. The last two hunks
comprise about 72% of the diff, and can be manually accomplished by a
global replace of the string "-o $@" with "$(OUTPUTSPEC)". The first
four chunks are all of 2238 bytes.
--- /tmp/makefile 2012-03-22 01:28:33.300598646 -0700
+++ makefile 2012-03-22 13:36:19.201126159 -0700
@@ -29,6 +29,16 @@
# Asynchronous I/O support can be disabled if GNU make is invoked with
# NOASYNCH=1 on the command line.
#
+ifneq (,$(or $(findstring lint, $(MAKECMDGOALS)) ,$(findstring lint,
$(LINTALL))))
+STD=--std=c99
+OUTPUTSPEC=
+DEBUG=lint
+GCC=cppcheck
+else
+OUTPUTSPEC= -o $@
+STD=-std=c99
+endif
+#
# CC Command (and platform available options). (Poor man's autoconf)
#
# building the pdp11, or any vax simulator could use networking support
@@ -288,9 +298,13 @@
endif
endif
ifneq ($(DEBUG),)
- CFLAGS_G = -g -ggdb -g3
- CFLAGS_O = -O0
- BUILD_FEATURES = - debugging support
+ ifeq ($(OUTPUTSPEC),)
+ CFLAGS_G = --enable=all --template=gcc --suppress=variableScope
--suppress=invalidscanf
+ else
+ CFLAGS_G = -g -ggdb -g3
+ CFLAGS_O = -O0
+ BUILD_FEATURES = - debugging support
+ endif
else
CFLAGS_O = -O2
LDFLAGS_O =
@@ -338,14 +352,19 @@
ifneq ($(DONT_USE_ROMS),)
ROMS_OPT = -DDONT_USE_INTERNAL_ROM
else
- BUILD_ROMS = ${BIN}BuildROMs${EXE}
+ ifeq (,$(findstring lint,$(MAKECMDGOALS)))
+ BUILD_ROMS = ${BIN}BuildROMs${EXE}
+ endif
endif
ifneq ($(DONT_USE_READER_THREAD),)
NETWORK_OPT += -DDONT_USE_READER_THREAD
endif
-CC = $(GCC) -std=c99 -U__STRICT_ANSI__ $(CFLAGS_G) $(CFLAGS_O) -I .
$(OS_CCDEFS) $(ROMS_OPT)
-LDFLAGS = $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O)
+CC = $(GCC) $(STD) -U__STRICT_ANSI__ $(CFLAGS_G) $(CFLAGS_O) -I . $(OS_CCDEFS)
$(ROMS_OPT)
+
+ifeq (,$(findstring lint,$(MAKECMDGOALS)))
+ LDFLAGS = $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O)
+endif
#
# Common Libraries
@@ -586,6 +605,17 @@
id32 sds lgp h316 swtp
all : ${ALL}
+#
+# Having a lint entry was once traditional in unix makefiles. There is no free
+# lint (tanstaafl :), however that can fully handle ANSI C without choking.
+# For example, "splint" 3.1.2 chokes on ellipses in #define parameter lists.
+#
+# However... the latest version of "cppfree" (1.53) works pretty well. I can
+# guarantee, though, that 1.47 (currently in ubuntu repositories) will not.
+#
+
+lint: ;
+ ${MAKE} GCC=$(GCC) all LINTALL=lint LDFLAGS=
clean :
ifeq ($(WIN32),)
@@ -598,9 +628,9 @@
${BIN}BuildROMs${EXE} :
${MKDIRBIN}
ifeq (agcc,$(findstring agcc,$(firstword $(CC))))
- gcc $(wordlist 2,1000,${CC}) sim_BuildROMs.c -o $@
+ gcc $(wordlist 2,1000,${CC}) sim_BuildROMs.c $(OUTPUTSPEC)
else
- ${CC} sim_BuildROMs.c -o $@
+ ${CC} sim_BuildROMs.c $(OUTPUTSPEC)
endif
ifeq ($(WIN32),)
$@
@@ -620,160 +650,160 @@
${BIN}pdp1${EXE} : ${PDP1} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP1} ${SIM} ${PDP1_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp4 : ${BIN}pdp4${EXE}
${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp7 : ${BIN}pdp7${EXE}
${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp8 : ${BIN}pdp8${EXE}
${BIN}pdp8${EXE} : ${PDP8} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP8} ${SIM} ${PDP8_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp9 : ${BIN}pdp9${EXE}
${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp15 : ${BIN}pdp15${EXE}
${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp10 : ${BIN}pdp10${EXE}
${BIN}pdp10${EXE} : ${PDP10} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP10} ${SIM} ${PDP10_OPT} $(OUTPUTSPEC) ${LDFLAGS}
pdp11 : ${BIN}pdp11${EXE}
${BIN}pdp11${EXE} : ${PDP11} ${SIM}
${MKDIRBIN}
- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${PDP11} ${SIM} ${PDP11_OPT} $(OUTPUTSPEC) ${LDFLAGS}
vax : ${BIN}vax${EXE}
${BIN}vax${EXE} : ${VAX} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${VAX} ${SIM} ${VAX_OPT} $(OUTPUTSPEC) ${LDFLAGS}
vax780 : ${BIN}vax780${EXE}
${BIN}vax780${EXE} : ${VAX780} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
- ${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${VAX780} ${SIM} ${VAX780_OPT} $(OUTPUTSPEC) ${LDFLAGS}
nova : ${BIN}nova${EXE}
${BIN}nova${EXE} : ${NOVA} ${SIM}
${MKDIRBIN}
- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${NOVA} ${SIM} ${NOVA_OPT} $(OUTPUTSPEC) ${LDFLAGS}
eclipse : ${BIN}eclipse${EXE}
${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
${MKDIRBIN}
- ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} $(OUTPUTSPEC) ${LDFLAGS}
h316 : ${BIN}h316${EXE}
${BIN}h316${EXE} : ${H316} ${SIM}
${MKDIRBIN}
- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${H316} ${SIM} ${H316_OPT} $(OUTPUTSPEC) ${LDFLAGS}
hp2100 : ${BIN}hp2100${EXE}
${BIN}hp2100${EXE} : ${HP2100} ${SIM}
${MKDIRBIN}
- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${HP2100} ${SIM} ${HP2100_OPT} $(OUTPUTSPEC) ${LDFLAGS}
i1401 : ${BIN}i1401${EXE}
${BIN}i1401${EXE} : ${I1401} ${SIM}
${MKDIRBIN}
- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${I1401} ${SIM} ${I1401_OPT} $(OUTPUTSPEC) ${LDFLAGS}
i1620 : ${BIN}i1620${EXE}
${BIN}i1620${EXE} : ${I1620} ${SIM}
${MKDIRBIN}
- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${I1620} ${SIM} ${I1620_OPT} $(OUTPUTSPEC) ${LDFLAGS}
i7094 : ${BIN}i7094${EXE}
${BIN}i7094${EXE} : ${I7094} ${SIM}
${MKDIRBIN}
- ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${I7094} ${SIM} ${I7094_OPT} $(OUTPUTSPEC) ${LDFLAGS}
ibm1130 : ${BIN}ibm1130${EXE}
${BIN}ibm1130${EXE} : ${IBM1130}
${MKDIRBIN}
- ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} $(OUTPUTSPEC) ${LDFLAGS}
s3 : ${BIN}s3${EXE}
${BIN}s3${EXE} : ${S3} ${SIM}
${MKDIRBIN}
- ${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${S3} ${SIM} ${S3_OPT} $(OUTPUTSPEC) ${LDFLAGS}
altair : ${BIN}altair${EXE}
${BIN}altair${EXE} : ${ALTAIR} ${SIM}
${MKDIRBIN}
- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} $(OUTPUTSPEC) ${LDFLAGS}
altairz80 : ${BIN}altairz80${EXE}
${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM}
${MKDIRBIN}
- ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} $(OUTPUTSPEC) ${LDFLAGS}
gri : ${BIN}gri${EXE}
${BIN}gri${EXE} : ${GRI} ${SIM}
${MKDIRBIN}
- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${GRI} ${SIM} ${GRI_OPT} $(OUTPUTSPEC) ${LDFLAGS}
lgp : ${BIN}lgp${EXE}
${BIN}lgp${EXE} : ${LGP} ${SIM}
${MKDIRBIN}
- ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${LGP} ${SIM} ${LGP_OPT} $(OUTPUTSPEC) ${LDFLAGS}
id16 : ${BIN}id16${EXE}
${BIN}id16${EXE} : ${ID16} ${SIM}
${MKDIRBIN}
- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${ID16} ${SIM} ${ID16_OPT} $(OUTPUTSPEC) ${LDFLAGS}
id32 : ${BIN}id32${EXE}
${BIN}id32${EXE} : ${ID32} ${SIM}
${MKDIRBIN}
- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${ID32} ${SIM} ${ID32_OPT} $(OUTPUTSPEC) ${LDFLAGS}
sds : ${BIN}sds${EXE}
${BIN}sds${EXE} : ${SDS} ${SIM}
${MKDIRBIN}
- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${SDS} ${SIM} ${SDS_OPT} $(OUTPUTSPEC) ${LDFLAGS}
swtp : ${BIN}swtp${EXE}
${BIN}swtp${EXE} : ${SWTP} ${SIM}
${MKDIRBIN}
- ${CC} ${SWTP} ${SIM} ${SWTP_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${SWTP} ${SIM} ${SWTP_OPT} $(OUTPUTSPEC) ${LDFLAGS}
_______________________________________________
Simh mailing list
[email protected]
http://mailman.trailing-edge.com/mailman/listinfo/simh
