Improved Makefiles.

diff --git a/Makefile b/Makefile
index 427fccfb4bbe4297e4461af460b4f4e3ea070ff6..73ffad0922d2870ddfc5ba9848ba4083e442ad91 100644 (file)
--- 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 c18c9a4ed7b9192693f7abae926e1f7fb84962bb..ffaf5d6c7d7b6079725c70ba2d13c90db0c96b5e 100644 (file)
--- 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 9979a91e54ba112224a2a57355c17755556aa474..46462f90bc8a9e46f5a93c95da7efabfcb31d059 100644 (file)
--- 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 72515918123c1265bd9627375ebdafbece57bac3..1148ba3eaa3805f5f7063e2d7b95c4e605c0899b 100644 (file)
--- 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