From 184cdb36faa9cdf7e71af47a49c140b6fc4cebef Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Fri, 4 Nov 2011 19:12:04 +0800
Subject: [PATCH] Usermode/AxWin3 - Moved interface library to Applications
 tree

---
 Makefile                                                      | 2 +-
 Usermode/Applications/axwin3_src/Makefile                     | 2 +-
 .../axwin3_src}/libaxwin3.so_src/Makefile                     | 4 ++--
 .../axwin3_src}/libaxwin3.so_src/include/internal.h           | 0
 .../axwin3_src}/libaxwin3.so_src/include/ipc.h                | 2 +-
 .../axwin3_src}/libaxwin3.so_src/main.c                       | 0
 .../axwin3_src}/libaxwin3.so_src/msg.c                        | 0
 .../axwin3_src}/libaxwin3.so_src/r_widget.c                   | 0
 .../axwin3_src}/libaxwin3.so_src/wm.c                         | 0
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/Makefile (66%)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/include/internal.h (100%)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/include/ipc.h (73%)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/main.c (100%)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/msg.c (100%)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/r_widget.c (100%)
 rename Usermode/{Libraries => Applications/axwin3_src}/libaxwin3.so_src/wm.c (100%)

diff --git a/Makefile b/Makefile
index d3171645..9821d169 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SUBMAKE = $(MAKE) --no-print-directory
 
 USRLIBS := crt0.o acess.ld ld-acess.so libgcc.so libc.so
 USRLIBS += libreadline.so libnet.so liburi.so
-USRLIBS += libaxwin2.so libaxwin3.so libimage_sif.so
+USRLIBS += libaxwin2.so libimage_sif.so
 
 USRAPPS := init login CLIShell cat ls mount
 USRAPPS += bomb
diff --git a/Usermode/Applications/axwin3_src/Makefile b/Usermode/Applications/axwin3_src/Makefile
index 3523ded8..59ab3cdf 100644
--- a/Usermode/Applications/axwin3_src/Makefile
+++ b/Usermode/Applications/axwin3_src/Makefile
@@ -1,6 +1,6 @@
 
 NAME = AxWin3
-DIRS = WM Interface
+DIRS = WM libaxwin3.so_src Interface
 
 SUBMAKE = $(MAKE) --no-print-directory
 
diff --git a/Usermode/Libraries/libaxwin3.so_src/Makefile b/Usermode/Applications/axwin3_src/libaxwin3.so_src/Makefile
similarity index 66%
rename from Usermode/Libraries/libaxwin3.so_src/Makefile
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/Makefile
index 8a910abd..6e6c3e5a 100644
--- a/Usermode/Libraries/libaxwin3.so_src/Makefile
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/Makefile
@@ -1,7 +1,7 @@
 # Acess 2 - AxWin GUI Library
 #
 
-include ../Makefile.cfg
+include ../../../Libraries/Makefile.cfg
 
 CPPFLAGS +=
 CFLAGS   += -Wall
@@ -10,4 +10,4 @@ LDFLAGS  += -lc -soname libaxwin3.so
 OBJ = main.o msg.o wm.o r_widget.o
 BIN = libaxwin3.so
 
-include ../Makefile.tpl
+include ../../../Libraries/Makefile.tpl
diff --git a/Usermode/Libraries/libaxwin3.so_src/include/internal.h b/Usermode/Applications/axwin3_src/libaxwin3.so_src/include/internal.h
similarity index 100%
rename from Usermode/Libraries/libaxwin3.so_src/include/internal.h
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/include/internal.h
diff --git a/Usermode/Libraries/libaxwin3.so_src/include/ipc.h b/Usermode/Applications/axwin3_src/libaxwin3.so_src/include/ipc.h
similarity index 73%
rename from Usermode/Libraries/libaxwin3.so_src/include/ipc.h
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/include/ipc.h
index 8cbe20d8..36865937 100644
--- a/Usermode/Libraries/libaxwin3.so_src/include/ipc.h
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/include/ipc.h
@@ -8,7 +8,7 @@
 #ifndef _IPCMESSAGES_LIB_H_
 #define _IPCMESSAGES_LIB_H_
 
-#include "../../../Applications/axwin3_src/WM/include/ipcmessages.h"
+#include "../../WM/include/ipcmessages.h"
 
 #endif
 
diff --git a/Usermode/Libraries/libaxwin3.so_src/main.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/main.c
similarity index 100%
rename from Usermode/Libraries/libaxwin3.so_src/main.c
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/main.c
diff --git a/Usermode/Libraries/libaxwin3.so_src/msg.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c
similarity index 100%
rename from Usermode/Libraries/libaxwin3.so_src/msg.c
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c
diff --git a/Usermode/Libraries/libaxwin3.so_src/r_widget.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c
similarity index 100%
rename from Usermode/Libraries/libaxwin3.so_src/r_widget.c
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c
diff --git a/Usermode/Libraries/libaxwin3.so_src/wm.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
similarity index 100%
rename from Usermode/Libraries/libaxwin3.so_src/wm.c
rename to Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
-- 
2.20.1