Makefile: Make the directfb optional

and also move some of the depends.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index faf84f904f459fbebd98918c537c8bc805f5e104..c48d0d5570f6f143eb5ee95520627c47fecee2d2 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -188,7 +188,7 @@ distdir:
 # This target includes all userspace tools and images
 # It does not include the Linux drivers/modules found in the modulespace target
 .PHONY:        root_image-userspace-install
-root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install  perf-install oprofile-install
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install  irqbalance-install pm-utils-install cpufrequtils-install  perf-install oprofile-install
 
        rm -rf userspace/man
        rm -rf userspace/usr/share/man
@@ -818,6 +818,7 @@ perf-depend:
        $(call RPM_TO_USERSPACE,*libnewt*.so*,$(RPM_DIR)/newt)
        $(call RPM_TO_USERSPACE,./usr/bin/less,$(RPM_DIR)/less)
        $(call RPM_TO_USERSPACE,./usr/bin/expand,$(RPM_DIR)/coreutils)
+       $(call RPM_TO_USERSPACE,./usr/bin/objdump,$(RPM_DIR)/binutils)
 
 .PHONY: perf-install
 perf-install: perf-depend
@@ -840,6 +841,11 @@ oprofile-install:
        mkdir -p $(CURDIR)/userspace/usr/share/oprofile
        cp -rdf oprofile/events/i386    $(CURDIR)/userspace/usr/share/oprofile
        cp -rdf oprofile/events/x86-64  $(CURDIR)/userspace/usr/share/oprofile
+ifeq ($(RPM_ARCH), x86_64)
+       $(call RPM_TO_USERSPACE,./usr/lib64/libopcodes*,$(RPM_DIR)/binutils)
+else
+       $(call RPM_TO_USERSPACE,./usr/lib/libopcodes*,$(RPM_DIR)/binutils)
+endif
 
 XEN_SRC = $(dir $(CURDIR))xen
 XEN_DISTDIR = $(dir $(CURDIR))xen/dist/install
@@ -913,8 +919,12 @@ busybox/.config:  busybox.config
        cp busybox.config $@
        $(MAKE) -j$$(($(NCPUS) * 2)) -C busybox oldconfig
 
+.PHONY: xtt-tools-install-fb
+xtt-tools-install-fb: directfb-install
+       $(INSTALL_PROG)   tools/drfb_test/dfbtest_fillrect     userspace/usr/bin/
+
 .PHONY: xtt-tools-install
-xtt-tools-install: directfb-install
+xtt-tools-install:
        LDLIBS="-L$(shell pwd)/userspace/$(LIBSDIR)" $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) -C tools
        $(INSTALL_PROG)   tools/ssh_support/ssh-shadowgen     userspace/usr/sbin/
        $(INSTALL_SCRIPT) tools/ssh_support/sshd_server       userspace/usr/bin/
@@ -926,14 +936,6 @@ xtt-tools-install: directfb-install
        $(INSTALL_PROG)   tools/debug/fb_test     userspace/usr/bin/
        $(INSTALL_PROG)   tools/crashme/crashme     userspace/usr/bin/
        $(INSTALL_PROG)   tools/eatmem/eatmem     userspace/usr/bin/
-       $(INSTALL_PROG)   tools/drfb_test/dfbtest_fillrect     userspace/usr/bin/
-       $(INSTALL_PROG)   tools/drfb_load/drfb_load     userspace/usr/bin/
-       $(call RPM_TO_USERSPACE,./usr/bin/objdump,$(RPM_DIR)/binutils)
-ifeq ($(RPM_ARCH), x86_64)
-       $(call RPM_TO_USERSPACE,./usr/lib64/libopcodes*,$(RPM_DIR)/binutils)
-else
-       $(call RPM_TO_USERSPACE,./usr/lib/libopcodes*,$(RPM_DIR)/binutils)
-endif
 
 fio/fio: fio/fio
        $(MAKE) -j$$(($(NCPUS) * 2)) -C fio