From 6a727b68a2c9796a216e2a71a63f6fff069245de Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Mon, 17 Oct 2011 22:59:04 +0800
Subject: [PATCH 1/1] Usermode - Build fixes (slight ones)

---
 Usermode/Applications/axwin2_src/Makefile   |  4 +++-
 Usermode/Applications/axwin2_src/WM/input.c | 22 ++++++++++++++-------
 Usermode/Filesystem/Makefile                |  7 +++++--
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Usermode/Applications/axwin2_src/Makefile b/Usermode/Applications/axwin2_src/Makefile
index 74a9d25f..1174798c 100644
--- a/Usermode/Applications/axwin2_src/Makefile
+++ b/Usermode/Applications/axwin2_src/Makefile
@@ -4,7 +4,9 @@ DIRS = WM Shell_src
 
 SUBMAKE = $(MAKE) --no-print-directory
 
-all install:
+all:
+	@$(foreach DIR,$(DIRS), echo --- $(NAME)/$(DIR); $(SUBMAKE) -C $(DIR) $@ ;)
+install:
 	@$(foreach DIR,$(DIRS), echo --- $(NAME)/$(DIR); $(SUBMAKE) -C $(DIR) $@ ;)
 
 clean:
diff --git a/Usermode/Applications/axwin2_src/WM/input.c b/Usermode/Applications/axwin2_src/WM/input.c
index aa7f3b37..08cefc72 100644
--- a/Usermode/Applications/axwin2_src/WM/input.c
+++ b/Usermode/Applications/axwin2_src/WM/input.c
@@ -51,26 +51,34 @@ void Input_HandleSelect(fd_set *set)
 	if(FD_ISSET(giMouseFD, set))
 	{
 		struct sMouseInfo {
-			uint16_t	NAxies, NButtons;
+			uint16_t	NAxies;
+			uint16_t	NButtons;
 			struct sMouseAxis {
-				 int16_t	MinValue, MaxValue;
+				 int16_t	MinValue;
+				 int16_t	MaxValue;
 				 int16_t	CurValue;
 				uint16_t	CursorPos;
 			}	Axies[2];
 			uint8_t	Buttons[3];
 		}	mouseinfo;
 	
-		_SysDebug("Cursor event");
-
-		seek(giMouseFD, 0, SEEK_SET);	
+		seek(giMouseFD, 0, SEEK_SET);
 		if( read(giMouseFD, &mouseinfo, sizeof(mouseinfo)) != sizeof(mouseinfo) )
 		{
 			// Not a 3 button mouse, oops
 			return ;
 		}
-		
+
+//		_SysDebug("sizeof(uint16_t) = %i, sizeof(int16_t) = %i",
+//			sizeof(uint16_t), sizeof(int16_t));
+//		_SysDebug("NAxies=%i,NButtons=%i", mouseinfo.NAxies, mouseinfo.NButtons);
+//		_SysDebug("offsetof(Axies[0].MinValue) = %i", offsetof(struct sMouseInfo, Axies[0].MinValue));
+//		_SysDebug("[0] = {MinValue=%i,MaxValue=%i,CurValue=%i}",
+//			mouseinfo.Axies[0].MinValue, mouseinfo.Axies[0].MaxValue,
+//			mouseinfo.Axies[0].CurValue
+//			);
 		// Handle movement
 //		Video_SetCursorPos( mouseinfo.Axies[0], mouseinfo.Axies[1] );
-		_SysDebug("Cursor to %i,%i\n", mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos);
+		_SysDebug("Cursor to %i,%i", mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos);
 	}
 }
diff --git a/Usermode/Filesystem/Makefile b/Usermode/Filesystem/Makefile
index 8723c6ac..7eb06940 100644
--- a/Usermode/Filesystem/Makefile
+++ b/Usermode/Filesystem/Makefile
@@ -12,12 +12,15 @@ FILES = Conf/BootConf.cfg
 #FILES := $(addprefix $(DISTROOT)/,$(FILES))
 
 .PHONY: all clean
-.PHONY: $(DIRS) $(FILES)
+.PHONY: $(DIRS) $(FILES) DISTROOT
 
-install:	$(DIRS) $(FILES)
+install: DISTROOT $(DIRS) $(FILES)
 
 clean:
 
+DISTROOT:
+	$(xMKDIR) $(DISTROOT); true
+
 $(DIRS):
 	$(xMKDIR) $(DISTROOT)/$@; true
 
-- 
2.20.1