From: darkcoven <admin@darkcoven.tk>
Date: Sun, 30 Dec 2012 16:19:57 +0000 (+0100)
Subject: Improved Makefiles.
X-Git-Url: https://git.sur5r.net/?p=ngadmin;a=commitdiff_plain;h=342c158724a84d9743b074a83f5146862985bbce;ds=sidebyside

Improved Makefiles.
---

diff --git a/Makefile b/Makefile
index 427fccf..73ffad0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,15 @@ all: lib libdoc cli
 
 
 lib: force
-	@cd lib && make lib
+	@+$(MAKE) -C lib lib
 
 
 libdoc: force
-	@cd lib && make libdoc
+	@+$(MAKE) -C lib libdoc
 
 
 cli: force
-	@cd cli && make
+	@+$(MAKE) -C cli
 
 
 
@@ -22,11 +22,11 @@ force:
 
 
 clean:
-	@cd lib && make clean
-	@cd cli && make clean
+	@+$(MAKE) -C lib clean
+	@+$(MAKE) -C cli clean
 
 mrproper: clean
-	@cd lib && make mrproper
-	@cd cli && make mrproper
+	@+$(MAKE) -C lib mrproper
+	@+$(MAKE) -C cli mrproper
 
 
diff --git a/cli/Makefile b/cli/Makefile
index c18c9a4..ffaf5d6 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -29,7 +29,7 @@ clean:
 	@rm -f *.o
 
 mrproper: clean
-	@rm -f $(EXEC)
+	@rm -f admin admind
 
 
 
diff --git a/lib/Makefile b/lib/Makefile
index 9979a91..46462f9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ all: lib libdoc
 
 
 lib: 
-	@cd src && make
+	@+$(MAKE) -C src
 
 libdoc: 
 	doxygen ngadmin
@@ -14,8 +14,8 @@ libdoc:
 
 clean: 
 	@rm -rf doc
-	@cd src && make clean
+	@+$(MAKE) -C src clean
 
 mrproper: clean
-	@cd src && make mrproper
+	@+$(MAKE) -C src mrproper
 
diff --git a/lib/src/Makefile b/lib/src/Makefile
index 7251591..1148ba3 100644
--- a/lib/src/Makefile
+++ b/lib/src/Makefile
@@ -29,6 +29,6 @@ clean:
 	@rm -f *.o
 
 mrproper: clean
-	@rm -f $(EXEC)
+	@rm -f ../libngadmin.so ../libngadmind.so