[refactoring] Update the main Makefile to build the new libraries

Signed-off-by: Thomas Gazagnaire <thomas.gazagnaire@citrix.com>

diff --git a/Makefile b/Makefile
index 66be7d09e3f4cfd37438e6d63ebec78b3c0124b2..632d22f12c8e1e4afd88105a2b5dea16ebc656b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,17 @@ all:
        $(MAKE) -C uuid
        $(MAKE) -C camldm
        $(MAKE) -C stdext
-       $(MAKE) -C cdrom
        $(MAKE) -C log
-       $(MAKE) -C sha1
+       $(MAKE) -C stunnel
+       $(MAKE) -C pciutil
+       $(MAKE) -C cdrom
        $(MAKE) -C xml-light2
+       $(MAKE) -C rss
        $(MAKE) -C rpc-light
- 
+       $(MAKE) -C http-svr
+       $(MAKE) -C close-and-exec
+       $(MAKE) -C sexpr
+
 allxen:
        $(MAKE) -C mmap
        $(MAKE) -C xc
@@ -32,11 +37,16 @@ install:
        $(MAKE) -C uuid install
        $(MAKE) -C camldm install
        $(MAKE) -C stdext install
-       $(MAKE) -C cdrom install
        $(MAKE) -C log install
-       $(MAKE) -C sha1 install
+       $(MAKE) -C stunnel install
+       $(MAKE) -C pciutil install
+       $(MAKE) -C cdrom install
        $(MAKE) -C xml-light2 install
+       $(MAKE) -C rss install
        $(MAKE) -C rpc-light install
+       $(MAKE) -C http-svr install
+       $(MAKE) -C close-and-exec install
+       $(MAKE) -C sexpr install
 
 installxen:
        $(MAKE) -C mmap install
@@ -50,11 +60,16 @@ uninstall:
        $(MAKE) -C uuid uninstall
        $(MAKE) -C camldm uninstall
        $(MAKE) -C stdext uninstall
-       $(MAKE) -C cdrom uninstall
        $(MAKE) -C log uninstall
-       $(MAKE) -C sha1 uninstall
+       $(MAKE) -C stunnel uninstall
+       $(MAKE) -C pciutil uninstall
+       $(MAKE) -C cdrom uninstall
        $(MAKE) -C xml-light2 uninstall
+       $(MAKE) -C rss uninstall
        $(MAKE) -C rpc-light uninstall
+       $(MAKE) -C http-svr uninstall
+       $(MAKE) -C close-and-exec uninstall
+       $(MAKE) -C sexpr uninstall
 
 uninstallxen:
        $(MAKE) -C eventchn uninstall
@@ -64,6 +79,13 @@ uninstallxen:
        $(MAKE) -C xc uninstall
        $(MAKE) -C mmap uninstall
 
+bins:
+       $(MAKE) -C pciutil bins
+       $(MAKE) -C xml-light2 bins
+       $(MAKE) -C sexpr bins
+       $(MAKE) -C stdext bins
+
+
 OUTPUT_API_PKG := $(MY_OUTPUT_DIR)/api-libs.tar.gz
 
 $(OUTPUT_API_PKG): DESTDIR=$(MY_OBJ_DIR)/staging/
@@ -109,11 +131,16 @@ clean:
        make -C uuid clean
        make -C camldm clean
        make -C stdext clean
-       make -C cdrom clean
        make -C log clean
-       make -C sha1 clean
+       make -C stunnel clean
+       make -C pciutil clean
+       make -C cdrom clean
        make -C xml-light2 clean
+       make -C rss clean
        make -C rpc-light clean
+       make -C http-svr clean
+       make -C close-and-exec clean
+       make -C sexpr clean
        rm -f $(OUTPUT_API_PKG)
 
 cleanxen:

diff --git a/rebuild b/rebuild
index ccd8934c92af1d526293ddc7f0e5d7aab11827ca..dabd578f502c0c524f170222b0f32c8e3d916e97 100755 (executable)
--- a/rebuild
+++ b/rebuild
@@ -3,4 +3,4 @@
 set -e 
 make clean; make cleanxen;
 make uninstall; make uninstallxen;
-make all && make install && make allxen && make installxen
+make all && make bins && make install && make allxen && make installxen