Packages: consilidate build of directfb, freetype, libpng, jpeg

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

4 files changed, 52 insertions, 37 deletions

diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk
index 7df8a57..19226ae 100644
--- a/packages/graphics/directfb/directfb.mk
+++ b/packages/graphics/directfb/directfb.mk
@@ -73,10 +73,6 @@ $(DIRECTFB_BUILD_DIR)/.decompressed:
 
 $(DIRECTFB_BUILD_DIR)/.configured:
 	cd $(DIRECTFB_BUILD_DIR); \
-	PATH="$(ROOTFS)/usr/bin:$$PATH" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(ROOTFS)/usr/lib/pkgconfig \
-	PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \
 	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="-L$(ROOTFS)/usr/lib -L$(ROOTFS)/usr/lib32 \
 	-L$(ROOTFS)/lib -L$(ROOTFS)/lib32 \
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index 143c0f6..7b49b61 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -31,7 +31,7 @@ FREETYPE_BINS = freetype*
 FREETYPE_SBINS =
 FREETYPE_INCLUDES = ft*build.h freetype*
 FREETYPE_LIBS = libfreetype*
-FREETYPE_PKGCONFIG = freetype*.pc
+FREETYPE_PKGCONFIGS = freetype*.pc
 
 freetype_install: $(FREETYPE_BUILD_DIR)/.installed
 
@@ -60,9 +60,6 @@ $(FREETYPE_BUILD_DIR)/.decompressed:
 
 $(FREETYPE_BUILD_DIR)/.configured:
 	$(Q)cd $(FREETYPE_BUILD_DIR); \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(ROOTFS)/usr/lib/pkgconfig \
-	PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \
 	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	--prefix=/usr --enable-static=no
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index b15bb54..7852235 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -27,6 +27,11 @@ LIBJPEG_SITE := http://www.ijg.org/files
 LIBJPEG_PACKAGE := jpegsrc.$(LIBJPEG_VERSION).tar.gz
 LIBJPEG_BUILD_DIR := $(PACKAGES_BUILD)/jpeg-7
 
+LIBJPEG_BINS := cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+LIBJPEG_SBINS :=
+LIBJPEG_LIBS := libjpeg*
+LIBJEPG_INCLUDES := jconfig.h jerror.h jmorecfg.h jpeglib.h
+
 libjpeg_install: $(LIBJPEG_BUILD_DIR)/.installed
 
 $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
@@ -34,10 +39,9 @@ $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
 	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
 	jpeg-$(LIBJPEG_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(ROOTFS) install
+	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(SYSROOT) install
 	$(Q)$(MAKE) $(LIBJPEG_BUILD_DIR)/.libtoolpatched
-	$(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
-	$(Q)rm -rf $(ROOTFS)/usr/include
+
 	@touch $@
 
 download_libjpeg:
@@ -54,26 +58,33 @@ $(LIBJPEG_BUILD_DIR)/.decompressed:
 
 $(LIBJPEG_BUILD_DIR)/.configured:
 	cd $(LIBJPEG_BUILD_DIR); \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(ROOTFS)/usr/lib/pkgconfig \
-	PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \
 	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	--target=$(STRICT_GNU_TARGET) \
-	--prefix=/usr \
-	--datarootdir=$(SYSROOT)/usr --enable-static=no --program-suffix=""
+	--prefix=/usr --enable-static=no --program-suffix=""
 	@touch $@
 
 $(LIBJPEG_BUILD_DIR)/.libtoolpatched:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-	$(Q)cd $(ROOTFS)/usr/lib32; \
-	cat libjpeg.la | sed -e 's;\/usr\/lib;$(ROOTFS)\/usr\/lib32;' \
+	$(Q)cd $(SYSROOT)/usr/lib32; \
+	cat libjpeg.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib32;' \
 	> libjpeg.la.new;\
 	cp libjpeg.la.new libjpeg.la; rm  libjpeg.la.new
 else
-	$(Q)cd $(ROOTFS)/usr/lib; \
-	cat libjpeg.la | sed -e 's;\/usr\/lib;$(ROOTFS)\/usr\/lib;' \
+	$(Q)cd $(SYSROOT)/usr/lib; \
+	cat libjpeg.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib;' \
 	> libjpeg.la.new;\
 	cp libjpeg.la.new libjpeg.la; rm  libjpeg.la.new
 endif
 
+libjpeg_clean:
+	$(call EMBTK_GENERIC_MESSAGE,"cleanup jpeg-$(LIBJPEG_VERSION)...")
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBJPEG_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBJPEG_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBJPEG_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(LIBJPEG_LIBS)
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+	$(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(LIBJPEG_LIBS)
+endif
+
+
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index 0868f6b..ec9b61f 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -27,6 +27,12 @@ LIBPNG_SITE := http://download.sourceforge.net/libpng
 LIBPNG_PACKAGE := libpng-$(LIBPNG_VERSION).tar.gz
 LIBPNG_BUILD_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
 
+LIBPNG_BINS = libpng*
+LIBPNG_SBINS =
+LIBPNG_INCLUDES = libpng* png*
+LIBPNG_LIBS = libpng*
+LIBPNG_PKGCONFIGS = libpng*
+
 libpng_install: $(LIBPNG_BUILD_DIR)/.installed
 
 $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \
@@ -34,12 +40,10 @@ $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \
 	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
 	libpng-$(LIBPNG_VERSION) in your root filesystem...")
 	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(ROOTFS) install
+	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install
 	$(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libtoolpatched
 	$(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.pkgconfigpatched
 	$(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libpng-configpatched
-	$(Q)-mv $(ROOTFS)/usr/include/* $(SYSROOT)/usr/include/
-	$(Q)rm -rf $(ROOTFS)/usr/include
 	@touch $@
 
 download_libpng:
@@ -56,14 +60,9 @@ $(LIBPNG_BUILD_DIR)/.decompressed:
 
 $(LIBPNG_BUILD_DIR)/.configured:
 	cd $(LIBPNG_BUILD_DIR); \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(ROOTFS)/usr/lib/pkgconfig \
-	PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \
 	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--prefix=/usr \
-	--datarootdir=$(SYSROOT)/usr \
-	--enable-static=no --with-libpng-compat=no
+	--prefix=/usr --enable-static=no --with-libpng-compat=no
 	@touch $@
 
 $(LIBPNG_BUILD_DIR)/.libpng-configpatched:
@@ -76,29 +75,41 @@ $(LIBPNG_BUILD_DIR)/.libpng-configpatched:
 
 $(LIBPNG_BUILD_DIR)/.libtoolpatched:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-	$(Q)cd $(ROOTFS)/usr/lib32; \
-	cat libpng.la | sed -e 's;\/usr\/lib;$(ROOTFS)\/usr\/lib32;' \
+	$(Q)cd $(SYSROOT)/usr/lib32; \
+	cat libpng.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib32;' \
 	> libpng.la.new;\
 	cp libpng.la.new libpng.la; rm  libpng.la.new
 else
-	$(Q)cd $(ROOTFS)/usr/lib; \
-	cat libpng.la | sed -e 's;\/usr\/lib;$(ROOTFS)\/usr\/lib;' \
+	$(Q)cd $(SYSROOT)/usr/lib; \
+	cat libpng.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib;' \
 	> libpng.la.new;\
 	cp libpng.la.new libpng.la; rm  libpng.la.new
 endif
 
 $(LIBPNG_BUILD_DIR)/.pkgconfigpatched:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-	$(Q)cd $(ROOTFS)/usr/lib32/pkgconfig; \
-	cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(ROOTFS)\/usr;' \
+	$(Q)cd $(SYSROOT)/usr/lib32/pkgconfig; \
+	cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(SYSROOT)\/usr;' \
 	-e 's;includedir=$${prefix}/include/libpng12;includedir=$(SYSROOT)/usr/include/libpng12;' \
 	> libpng.pc.new;\
 	cp libpng.pc.new libpng.pc; rm  libpng.pc.new
 else
-	$(Q)cd $(ROOTFS)/usr/lib/pkgconfig; \
-	cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(ROOTFS)\/usr;' \
+	$(Q)cd $(SYSROOT)/usr/lib/pkgconfig; \
+	cat libpng.pc | sed -e 's;prefix=\/usr;prefix=$(SYSROOT)\/usr;' \
 	-e 's;includedir=$${prefix}/include/libpng12;includedir=$(SYSROOT)/usr/include/libpng12;' \
 	> libpng.pc.new;\
 	cp libpng.pc.new libpng.pc; rm  libpng.pc.new
 endif
 
+libpng_clean:
+	$(call EMBTK_GENERIC_MESSAGE,"cleanup libpng-$(LIBPNG_VERSION)...")
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBPNG_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBPNG_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBPNG_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(LIBPNG_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(LIBPNG_PKGCONFIGS)
+ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
+	$(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(LIBPNG_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(LIBPNG_PKGCONFIGS)
+endif
+