summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-07 23:37:18 +0100
committerAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-07 23:43:51 +0100
commit69b7dff7072ce39932e563fd4cccaf0fb2099212 (patch)
treeb9234c430bb5aa65d2a8579e59881524294d576a
parent5763a77710bc7da45bb11494e5e69edc78e56045 (diff)
downloadembtoolkit-69b7dff7072ce39932e563fd4cccaf0fb2099212.tar.gz
embtoolkit-69b7dff7072ce39932e563fd4cccaf0fb2099212.tar.bz2
embtoolkit-69b7dff7072ce39932e563fd4cccaf0fb2099212.tar.xz
Rootfs: directfb: Rework directfb build by installing it in sysroot and creating clean target
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
-rw-r--r--mk/packages.mk5
-rw-r--r--packages/graphics/directfb/directfb.mk22
2 files changed, 21 insertions, 6 deletions
diff --git a/mk/packages.mk b/mk/packages.mk
index 0498158..603397b 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -61,18 +61,19 @@ endif
#mtd-utils
ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS),y)
ROOTFS_COMPONENTS += mtd-utils_target_install
-ROOTFS_COMPONENTS_CLEAN += mtd-utils_target_clean
endif
+ROOTFS_COMPONENTS_CLEAN += mtd-utils_target_clean
######################## Compression packages ##################################
########################### Graphics packages ##################################
#DirectFB
-ifeq ($(CONFIG_EMBTK_HAVE_DIRECTFB),y)
include $(EMBTK_ROOT)/packages/graphics/directfb/directfb.mk
+ifeq ($(CONFIG_EMBTK_HAVE_DIRECTFB),y)
ROOTFS_COMPONENTS += directfb_install
endif
+ROOTFS_COMPONENTS_CLEAN += directfb_clean
#FreeType
ifeq ($(CONFIG_EMBTK_HAVE_FREETYPE),y)
diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index fd26dfd..682006c 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -28,6 +28,13 @@ DIRECTFB_SITE := http://www.directfb.org/downloads/Core/$(DIRECTFB_BRANCH)
DIRECTFB_PACKAGE := DirectFB-$(DIRECTFB_VERSION).tar.gz
DIRECTFB_BUILD_DIR := $(PACKAGES_BUILD)/DirectFB-$(DIRECTFB_VERSION)
+DIRECTFB_BINS = c64xdump dfbfx dfbinfo dfbinspector dfbmaster dfbscreen \
+ directfb-csource mkdgiff dfbdump dfbg dfbinput dfblayer dfbpenmount \
+ directfb-config mkdfiff pxa3xx_dump
+DIRECTFB_SBINS =
+DIRECTFB_LIBS = directfb* libdavinci_c64x* libdirect* libdirectfb* libfusion*
+DIRECTFB_INCLUDES = directfb*
+
ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
FREETYPE_LIBS_FLAGS := "-L$(ROOTFS)/usr/lib32 -lfreetype"
else
@@ -43,9 +50,7 @@ $(DIRECTFB_BUILD_DIR)/.installed: libpng_install freetype_install \
$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
DirectFB-$(DIRECTFB_VERSION) in your root filesystem...")
$(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) $(J)
- $(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) DESTDIR=$(ROOTFS) install
- $(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
- $(Q)rm -rf $(ROOTFS)/usr/include
+ $(Q)$(MAKE) -C $(DIRECTFB_BUILD_DIR) DESTDIR=$(SYSROOT) install
@touch $@
download_directfb:
@@ -76,7 +81,16 @@ $(DIRECTFB_BUILD_DIR)/.configured:
FREETYPE_CFLAGS=$(FREETYPE_CFLAGS_FLAGS) \
./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
--target=$(STRICT_GNU_TARGET) --prefix=/usr \
- --datarootdir=$(SYSROOT)/usr \
--enable-static=no --program-suffix=""
@touch $@
+directfb_clean:
+ $(call EMBTK_GENERIC_MESSAGE,"cleanup directfb-$(DIRECTFB_VERSION)...")
+ $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DIRECTFB_BINS)
+ $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DIRECTFB_SBINS)
+ $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(DIRECTFB_LIBS)
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+ $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(DIRECTFB_LIBS)
+endif
+ $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DIRECTFB_INCLUDES)
+