From 7ab41f4e18165ed116576d0872e6faa41a1981f2 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sun, 21 Aug 2011 17:00:45 +0800
Subject: [PATCH] Usermode - Fixing build system

- And a silly documentation issue in ifconfig
---
 .gitignore                                | 10 ++++++----
 Usermode/Applications/Makefile.tpl        |  2 +-
 Usermode/Applications/ifconfig_src/main.c |  8 ++++----
 Usermode/Libraries/Makefile.tpl           |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd06742c..672b9ab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.o.*
 *.d.*
+*.dep.*
 *.xo.*
 *~
 *.o
@@ -8,10 +9,6 @@
 *.ao.*
 *.so
 *.so.*
-*.i486
-*.i386
-*.x86_64
-*.bin
 *.dsm
 *.dmp
 *.lin
@@ -36,3 +33,8 @@ gitstats/
 *.res.h
 Dist/
 obj-*/
+
+*.i486
+*.i386
+*.x86_64
+*.bin
diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index b2cfcd1f..13397655 100644
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -39,7 +39,7 @@ ifneq ($(_DBGMAKEFILE),)
 else
 	@$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
 endif
-	@$(DISASM) $(_BIN) > $(BIN).dsm
+	@$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(OBJ): $(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
diff --git a/Usermode/Applications/ifconfig_src/main.c b/Usermode/Applications/ifconfig_src/main.c
index bd21e2b1..6091bdcc 100644
--- a/Usermode/Applications/ifconfig_src/main.c
+++ b/Usermode/Applications/ifconfig_src/main.c
@@ -183,12 +183,12 @@ void PrintUsage(const char *ProgName)
 	fprintf(stderr, "    %s [<interface>]\n", ProgName);
 	fprintf(stderr, "        Print the current interfaces (or only <interface> if passed)\n");
 	fprintf(stderr, "\n");
-	fprintf(stderr, "    %s routes\n", ProgName);
+	fprintf(stderr, "    %s route\n", ProgName);
 	fprintf(stderr, "        Print the routing tables\n");
-	fprintf(stderr, "    %s routes add <host>[/<prefix>] [<nexthop> OR <iface>] [<metric>]\n", ProgName);
+	fprintf(stderr, "    %s route add <host>[/<prefix>] [<nexthop> OR <iface>] [<metric>]\n", ProgName);
 	fprintf(stderr, "        Add a new route\n");
-	fprintf(stderr, "    %s routes del <host>[/<prefix>]\n", ProgName);
-	fprintf(stderr, "    %s routes del <routenum>\n", ProgName);
+	fprintf(stderr, "    %s route del <host>[/<prefix>]\n", ProgName);
+	fprintf(stderr, "    %s route del <routenum>\n", ProgName);
 	fprintf(stderr, "        Add a new route\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "A note on Acess's IP Stack:\n");
diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 7a46c515..350eb08f 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -31,11 +31,11 @@ ifneq ($(_XBIN),)
 	$(xCP) $(_XBIN) $(DISTROOT)/Libs/
 endif
 
-$(_BIN): $(OBJ)
+$(_BIN): $(OBJ) $(_LIBS)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
 	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(DISASM) $(_BIN) > $(_BIN).dsm
+	@$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
-- 
2.20.1