122 lines
3.7 KiB
Diff
122 lines
3.7 KiB
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -4560,7 +4560,7 @@
|
|
|
|
|
|
|
|
-ac_config_files="$ac_config_files Makefile src/Makefile src/stdlib/Makefile src/float/Makefile src/usim-0.91-cmoc/Makefile macros/Makefile doc/Makefile doc/cmoc.1"
|
|
+ac_config_files="$ac_config_files Makefile src/Makefile src/stdlib/Makefile src/float/Makefile macros/Makefile doc/Makefile doc/cmoc.1"
|
|
|
|
cat >confcache <<\_ACEOF
|
|
# This file is a shell script that caches the results of configure
|
|
@@ -5318,7 +5318,6 @@
|
|
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
|
"src/stdlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/stdlib/Makefile" ;;
|
|
"src/float/Makefile") CONFIG_FILES="$CONFIG_FILES src/float/Makefile" ;;
|
|
- "src/usim-0.91-cmoc/Makefile") CONFIG_FILES="$CONFIG_FILES src/usim-0.91-cmoc/Makefile" ;;
|
|
"macros/Makefile") CONFIG_FILES="$CONFIG_FILES macros/Makefile" ;;
|
|
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
|
"doc/cmoc.1") CONFIG_FILES="$CONFIG_FILES doc/cmoc.1" ;;
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -191,7 +191,6 @@
|
|
src/Makefile
|
|
src/stdlib/Makefile
|
|
src/float/Makefile
|
|
- src/usim-0.91-cmoc/Makefile
|
|
macros/Makefile
|
|
doc/Makefile
|
|
doc/cmoc.1
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
# The dot forces CMOC to be compiled before processing the stdlib and float
|
|
# subdirectories, whose processing requires CMOC itself.
|
|
#
|
|
-SUBDIRS = usim-0.91-cmoc . stdlib float
|
|
+SUBDIRS = . stdlib float
|
|
|
|
bin_SCRIPTS = install-coco-boot-loader
|
|
|
|
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -449,7 +449,7 @@
|
|
# The dot forces CMOC to be compiled before processing the stdlib and float
|
|
# subdirectories, whose processing requires CMOC itself.
|
|
#
|
|
-SUBDIRS = usim-0.91-cmoc . stdlib float
|
|
+SUBDIRS = . stdlib float
|
|
bin_SCRIPTS = install-coco-boot-loader
|
|
cmoc_SOURCES = \
|
|
TypeDesc.cpp \
|
|
--- a/src/float/Makefile.am
|
|
+++ b/src/float/Makefile.am
|
|
@@ -10,12 +10,8 @@
|
|
cmoclib_DATA = \
|
|
float-ctor.ecb_o \
|
|
float-ctor.dgn_o \
|
|
- float-ctor.mc6839_o \
|
|
- float-ctor.mc6839_os9_o \
|
|
libcmoc-float-ecb.a \
|
|
- libcmoc-float-dgn.a \
|
|
- libcmoc-float-mc6839.a \
|
|
- libcmoc-float-mc6839_os9.a
|
|
+ libcmoc-float-dgn.a
|
|
|
|
if DISTRIBUTE_FLOATABLE
|
|
|
|
@@ -272,5 +268,5 @@
|
|
float.inc float-ctor.asm $(ASM) $(ASM_NOT_MC6839) $(ASM_MC6839) $(C_FILES) \
|
|
$(NATIVE_OTHER) \
|
|
$(FLOATABLE_ASM) $(FLOATABLE_C) \
|
|
- $(C_FILES_MSBASIC) $(H_FILES_MC6839) $(C_FILES_MC6839) Float09.bin
|
|
-
|
|
+ $(C_FILES_MSBASIC) $(H_FILES_MC6839) $(C_FILES_MC6839)
|
|
+
|
|
--- a/src/float/Makefile.in
|
|
+++ b/src/float/Makefile.in
|
|
@@ -271,10 +271,10 @@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
cmoclibdir = $(pkgdatadir)/lib
|
|
-cmoclib_DATA = float-ctor.ecb_o float-ctor.dgn_o float-ctor.mc6839_o \
|
|
- float-ctor.mc6839_os9_o libcmoc-float-ecb.a \
|
|
- libcmoc-float-dgn.a libcmoc-float-mc6839.a \
|
|
- libcmoc-float-mc6839_os9.a $(am__append_1)
|
|
+cmoclib_DATA = float-ctor.ecb_o float-ctor.dgn_o \
|
|
+ libcmoc-float-ecb.a \
|
|
+ libcmoc-float-dgn.a \
|
|
+ $(am__append_1)
|
|
|
|
# Utility routines called by CMOC-generated code.
|
|
# These routines use flt_* assembly language macros that are defined
|
|
@@ -455,7 +455,7 @@
|
|
float.inc float-ctor.asm $(ASM) $(ASM_NOT_MC6839) $(ASM_MC6839) $(C_FILES) \
|
|
$(NATIVE_OTHER) \
|
|
$(FLOATABLE_ASM) $(FLOATABLE_C) \
|
|
- $(C_FILES_MSBASIC) $(H_FILES_MC6839) $(C_FILES_MC6839) Float09.bin
|
|
+ $(C_FILES_MSBASIC) $(H_FILES_MC6839) $(C_FILES_MC6839)
|
|
|
|
all: all-am
|
|
|
|
--- a/src/stdlib/Makefile.am
|
|
+++ b/src/stdlib/Makefile.am
|
|
@@ -290,7 +290,6 @@
|
|
C_COCO_BASIC = \
|
|
disk.c \
|
|
readDECBFile.c \
|
|
- dskcon-standalone.c \
|
|
readDECBFileWithDECB.c \
|
|
read-disk-file.c
|
|
|
|
--- a/src/stdlib/Makefile.in
|
|
+++ b/src/stdlib/Makefile.in
|
|
@@ -579,7 +579,6 @@
|
|
C_COCO_BASIC = \
|
|
disk.c \
|
|
readDECBFile.c \
|
|
- dskcon-standalone.c \
|
|
readDECBFileWithDECB.c \
|
|
read-disk-file.c
|
|
|