From cb561773692096e6de0fb3bcaa744c6d611c17ab Mon Sep 17 00:00:00 2001
From: Aaron Culliney <asc_at_bitr0t_com>
Date: Sat, 31 May 2014 10:19:42 -0700
Subject: [PATCH] rename asm386 -> x86

---
 .gitignore                          |  2 +-
 Makefile.am                         | 12 ++++++------
 configure.ac                        |  2 +-
 src/{asm386 => x86}/cpu.S           |  0
 src/{asm386 => x86}/genglue         |  2 +-
 src/{asm386 => x86}/glue-prologue.h |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{asm386 => x86}/cpu.S (100%)
 rename src/{asm386 => x86}/genglue (75%)
 rename src/{asm386 => x86}/glue-prologue.h (100%)

diff --git a/.gitignore b/.gitignore
index 6b1d4b65..7cf6314f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@ apple2ix*.tar.gz
 
 # generated sources
 src/font.c
-src/asm386/glue.S
+src/x86/glue.S
 src/meta/debug.c
 
 # generated binaries
diff --git a/Makefile.am b/Makefile.am
index 9809e527..79f246fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ noinst_HEADERS = src/apple2.h src/common.h src/cpu.h src/disk.h src/glue.h \
 	src/interface.h src/joystick.h src/keys.h src/misc.h src/prefs.h \
 	src/timing.h src/uthash.h src/video/video.h src/zlib-helpers.h \
 	\
-	src/asm386/glue-prologue.h \
+	src/x86/glue-prologue.h \
 	src/meta/debug.h \
 	\
 	src/audio/alhelpers.h src/audio/AY8910.h src/audio/ds-shim.h \
@@ -29,7 +29,7 @@ noinst_PROGRAMS = genfont
 bin_PROGRAMS = apple2ix
 
 ASM_SRC = \
-	src/asm386/glue.S src/asm386/cpu.S
+	src/x86/glue.S src/x86/cpu.S
 
 INTERFACE_CLASSIC_SRC = \
 	src/interface.c
@@ -71,8 +71,8 @@ genfont_SOURCES = src/genfont.c
 src/font.c: src/font.txt genfont
 	./genfont < $< > $@
 
-src/asm386/glue.S: src/disk.c src/misc.c src/display.c src/vm.c @AUDIO_GLUE_C@
-	./src/asm386/genglue $^ > $@
+src/x86/glue.S: src/disk.c src/misc.c src/display.c src/vm.c @AUDIO_GLUE_C@
+	./src/x86/genglue $^ > $@
 
 ###############################################################################
 # Testing
@@ -115,6 +115,6 @@ EXTRA_DIST = reconf.sh configure README.debugger PROBLEMS .apple2 \
 	docs/apple2ix.6 \
 	\
 	src/font.txt \
-	src/asm386/genglue
+	src/x86/genglue
 
-CLEANFILES = src/font.c src/meta/debug.c src/asm386/glue.S
+CLEANFILES = src/font.c src/meta/debug.c src/x86/glue.S
diff --git a/configure.ac b/configure.ac
index 00082e27..7df29c51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ dnl at this point we believe arch/os is good ...
 ARCHOS_HACK_LDFLAGS="-L/usr/lib/i386-linux-gnu -L/lib/i386-linux-gnu"
 AC_SUBST(ARCHOS_HACK_LDFLAGS)
 
-ASM_O="src/asm386/glue.o src/asm386/cpu.o"
+ASM_O="src/x86/glue.o src/x86/cpu.o"
 AC_SUBST(ASM_O)
 
 
diff --git a/src/asm386/cpu.S b/src/x86/cpu.S
similarity index 100%
rename from src/asm386/cpu.S
rename to src/x86/cpu.S
diff --git a/src/asm386/genglue b/src/x86/genglue
similarity index 75%
rename from src/asm386/genglue
rename to src/x86/genglue
index 4b9f626d..6b135d21 100755
--- a/src/asm386/genglue
+++ b/src/x86/genglue
@@ -1,5 +1,5 @@
 #! /bin/sh
 echo '/* Automatically Generated -- do not edit */'
-echo '#include "asm386/glue-prologue.h"'
+echo '#include "x86/glue-prologue.h"'
 grep -E -h '^(GLUE_)|(#if)|(#endif)|(#else)|(#elif)' $*
 exit 0
diff --git a/src/asm386/glue-prologue.h b/src/x86/glue-prologue.h
similarity index 100%
rename from src/asm386/glue-prologue.h
rename to src/x86/glue-prologue.h