From 0970c067a8453b2a870c9e75be2b2d1f5355e9d0 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 14 Jan 2020 11:31:12 -0800 Subject: [PATCH] makefile: Rename primary target name for vax simulator make vax the primary build target and microvax3900 the copied result. The microvax3900 binary name was added when all the different VAX simulator models were add to simh and each was appropriately named based on the system model name of each respective simulator. The vax simulator name was the earliest vax implemented so a binary of that name is produced for upward compatibility for existing users. Producing the vax simulator and then copying it to microvax3900 produces equivalent results, but is easier to auto convert to cmake build configuration files which then will generate a vax project file when cmake is generating those. --- makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/makefile b/makefile index 7e86795a..01b7910f 100644 --- a/makefile +++ b/makefile @@ -2203,17 +2203,17 @@ ifneq (,$(call find_test,${PDP11D},uc15)) $@ $(call find_test,${PDP11D},uc15) ${TEST_ARG} endif -vax : microvax3900 +microvax3900 : vax -microvax3900 : ${BIN}microvax3900${EXE} +vax : ${BIN}vax${EXE} -${BIN}microvax3900${EXE} : ${VAX} ${SIM} ${BUILD_ROMS} +${BIN}vax${EXE} : ${VAX} ${SIM} ${BUILD_ROMS} ${MKDIRBIN} ${CC} ${VAX} ${SIM} ${VAX_OPT} ${CC_OUTSPEC} ${LDFLAGS} ifeq (${WIN32},) - cp ${BIN}microvax3900${EXE} ${BIN}vax${EXE} + cp ${BIN}vax${EXE} ${BIN}microvax3900${EXE} else - copy $(@D)\microvax3900${EXE} $(@D)\vax${EXE} + copy $(@D)\vax${EXE} $(@D)\microvax3900${EXE} endif ifneq (,$(call find_test,${VAXD},vax-diag)) $@ $(call find_test,${VAXD},vax-diag) ${TEST_ARG}