From c8e606164e7bb405295b2f14e6949d0812cfa342 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sun, 27 Feb 2011 18:47:00 +0800
Subject: [PATCH] Fixing makefiles

- Ignoring if $(xMKDIR) fails (darn mtools)
- Fiddling with warning flags
- Added axwin and others to /Makefile
---
 Makefile                           | 2 ++
 Modules/Makefile.tpl               | 4 ++--
 Usermode/Applications/Makefile.cfg | 2 +-
 Usermode/Applications/Makefile.tpl | 2 +-
 Usermode/Libraries/Makefile.tpl    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4cae511b..12c0264e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,12 @@ 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 libimage_sif.so
 
 USRAPPS := init login CLIShell cat ls mount
 USRAPPS += bomb pcidump
 USRAPPS += ifconfig ping irc
+USRAPPS += axwin2
 
 ALL_DYNMODS = $(addprefix all-,$(DYNMODS))
 ALL_MODULES := $(addprefix all-,$(MODULES))
diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index dc5d6f94..de3b36ab 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -41,7 +41,7 @@ clean:
 
 install: $(BIN)
 ifneq ($(BUILDTYPE),static)
-	$(xMKDIR) $(DISTROOT)/Modules/$(ARCH)
+	@$(xMKDIR) $(DISTROOT)/Modules/$(ARCH); true
 	$(xCP) $(BIN) $(DISTROOT)/Modules/$(ARCH)/$(NAME).kmd
 else
 endif
@@ -58,7 +58,7 @@ $(BIN): %.xo.$(ARCH): $(OBJ)
 	@$(LD) -r -o $@ $(OBJ)
 endif
 
-%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
+%.o.$(_SUFFIX): %.c Makefile $(CFGFILES)
 	@echo --- $(CC) -o $@
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 920526d2..2e64b9d6 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -13,6 +13,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
 
 ASFLAGS = -felf
 CPPFLAGS = -I$(ACESSUSERDIR)/include/
-CFLAGS   = -fno-stack-protector $(CPPFLAGS) -Wall
+CFLAGS   = -fno-stack-protector $(CPPFLAGS)
 LDFLAGS  = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc
 DIR = Bin
diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index 07bef0f8..9dc97870 100644
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -18,7 +18,7 @@ clean:
 	@$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm Map.txt
 
 install: $(_BIN)
-	@$(xMKDIR) $(DISTROOT)/$(DIR)
+	@$(xMKDIR) $(DISTROOT)/$(DIR); true
 	$(xCP) $(_BIN) $(DISTROOT)/$(DIR)/
 
 $(_BIN): $(OBJ)
diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index ec940664..ccae9cac 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -15,7 +15,7 @@ clean:
 	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
 
 install: all
-	@$(xMKDIR) $(DISTROOT)/Libs
+	@$(xMKDIR) $(DISTROOT)/Libs; true
 	$(xCP) $(_BIN) $(_XBIN) $(DISTROOT)/Libs/
 
 $(_BIN): $(OBJ)
-- 
2.20.1