diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-04 21:36:34 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-04 21:36:34 +0200 |
commit | c244e79c9db5c3a87feb645cf64ec974bf4c63ce (patch) | |
tree | 60671debebd42d7b90d1ed41222c2ac0819bfebc /packages/graphics | |
parent | 02bd09eea9470d4817d5e13b6d73d3d34c2c7647 (diff) | |
download | embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.gz embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.bz2 embtoolkit-c244e79c9db5c3a87feb645cf64ec974bf4c63ce.tar.xz |
Build system: replace SYSROOT -> embtk_sysroot
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/graphics')
-rw-r--r-- | packages/graphics/directfb/directfb.mk | 58 | ||||
-rw-r--r-- | packages/graphics/fontconfig/fontconfig.mk | 6 | ||||
-rw-r--r-- | packages/graphics/gtk/gtk.mk | 26 | ||||
-rw-r--r-- | packages/graphics/imlib2/imlib2.mk | 4 | ||||
-rw-r--r-- | packages/graphics/pango/pango.mk | 8 |
5 files changed, 51 insertions, 51 deletions
diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk index c9c54d1..4d82b9c 100644 --- a/packages/graphics/directfb/directfb.mk +++ b/packages/graphics/directfb/directfb.mk @@ -107,54 +107,54 @@ define embtk_postinstall_directfb $(Q)-cp $(DIRECTFB_BUILD_DIR)/fb.modes $(ROOTFS)/etc $(Q)mkdir -p $(ROOTFS)/usr $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)-cp -R $(SYSROOT)/usr/lib/directfb-*-* $(ROOTFS)/usr/$(LIBDIR) + $(Q)-cp -R $(embtk_sysroot)/usr/lib/directfb-*-* $(ROOTFS)/usr/$(LIBDIR) endef $(DIRECTFB_BUILD_DIR)/.patchlibtool: ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)DIRECTFB_LT_FILES=`find $(SYSROOT)/usr/lib32/directfb-* -type f -name *.la`; \ + $(Q)DIRECTFB_LT_FILES=`find $(embtk_sysroot)/usr/lib32/directfb-* -type f -name *.la`; \ for i in $$DIRECTFB_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib32\/libfusion.la ; $(SYSROOT)\/usr\/lib32\/libfusion.la ;" \ - -e "s; \/usr\/lib32\/libdirect.la ; $(SYSROOT)\/usr\/lib32\/libdirect.la ;" \ - -e "s; \/usr\/lib32\/libdirectfb.la ; $(SYSROOT)\/usr\/lib32\/libdirectfb.la ;" \ + -e "s; \/usr\/lib32\/libfusion.la ; $(embtk_sysroot)\/usr\/lib32\/libfusion.la ;" \ + -e "s; \/usr\/lib32\/libdirect.la ; $(embtk_sysroot)\/usr\/lib32\/libdirect.la ;" \ + -e "s; \/usr\/lib32\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib32\/libdirectfb.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done $(Q)sed \ - -e "s; \/usr\/lib32\/libfusion.la ; $(SYSROOT)\/usr\/lib32\/libfusion.la ;" \ - -e "s; \/usr\/lib32\/libdirect.la ; $(SYSROOT)\/usr\/lib32\/libdirect.la ;" \ - -e "s; \/usr\/lib32\/libdirectfb.la ; $(SYSROOT)\/usr\/lib32\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib32/libfusion.la > libfusion.la.new; \ - mv libfusion.la.new $(SYSROOT)/usr/lib32/libfusion.la + -e "s; \/usr\/lib32\/libfusion.la ; $(embtk_sysroot)\/usr\/lib32\/libfusion.la ;" \ + -e "s; \/usr\/lib32\/libdirect.la ; $(embtk_sysroot)\/usr\/lib32\/libdirect.la ;" \ + -e "s; \/usr\/lib32\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib32\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib32/libfusion.la > libfusion.la.new; \ + mv libfusion.la.new $(embtk_sysroot)/usr/lib32/libfusion.la $(Q)sed \ - -e "s; \/usr\/lib32\/libfusion.la ; $(SYSROOT)\/usr\/lib32\/libfusion.la ;" \ - -e "s; \/usr\/lib32\/libdirect.la ; $(SYSROOT)\/usr\/lib32\/libdirect.la ;" \ - -e "s; \/usr\/lib32\/libdirectfb.la ; $(SYSROOT)\/usr\/lib32\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib32/libdirectfb.la > libdirectfb.la.new; \ - mv libdirectfb.la.new $(SYSROOT)/usr/lib32/libdirectfb.la + -e "s; \/usr\/lib32\/libfusion.la ; $(embtk_sysroot)\/usr\/lib32\/libfusion.la ;" \ + -e "s; \/usr\/lib32\/libdirect.la ; $(embtk_sysroot)\/usr\/lib32\/libdirect.la ;" \ + -e "s; \/usr\/lib32\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib32\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib32/libdirectfb.la > libdirectfb.la.new; \ + mv libdirectfb.la.new $(embtk_sysroot)/usr/lib32/libdirectfb.la else - $(Q)DIRECTFB_LT_FILES=`find $(SYSROOT)/usr/lib/directfb-* -type f -name *.la`; \ + $(Q)DIRECTFB_LT_FILES=`find $(embtk_sysroot)/usr/lib/directfb-* -type f -name *.la`; \ for i in $$DIRECTFB_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib\/libfusion.la ; $(SYSROOT)\/usr\/lib\/libfusion.la ;" \ - -e "s; \/usr\/lib\/libdirect.la ; $(SYSROOT)\/usr\/lib\/libdirect.la ;" \ - -e "s; \/usr\/lib\/libdirectfb.la ; $(SYSROOT)\/usr\/lib\/libdirectfb.la ;" \ + -e "s; \/usr\/lib\/libfusion.la ; $(embtk_sysroot)\/usr\/lib\/libfusion.la ;" \ + -e "s; \/usr\/lib\/libdirect.la ; $(embtk_sysroot)\/usr\/lib\/libdirect.la ;" \ + -e "s; \/usr\/lib\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib\/libdirectfb.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done $(Q)sed \ - -e "s; \/usr\/lib\/libfusion.la ; $(SYSROOT)\/usr\/lib\/libfusion.la ;" \ - -e "s; \/usr\/lib\/libdirect.la ; $(SYSROOT)\/usr\/lib\/libdirect.la ;" \ - -e "s; \/usr\/lib\/libdirectfb.la ; $(SYSROOT)\/usr\/lib\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib/libfusion.la > libfusion.la.new; \ - mv libfusion.la.new $(SYSROOT)/usr/lib/libfusion.la + -e "s; \/usr\/lib\/libfusion.la ; $(embtk_sysroot)\/usr\/lib\/libfusion.la ;" \ + -e "s; \/usr\/lib\/libdirect.la ; $(embtk_sysroot)\/usr\/lib\/libdirect.la ;" \ + -e "s; \/usr\/lib\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib/libfusion.la > libfusion.la.new; \ + mv libfusion.la.new $(embtk_sysroot)/usr/lib/libfusion.la $(Q)sed \ - -e "s; \/usr\/lib\/libfusion.la ; $(SYSROOT)\/usr\/lib\/libfusion.la ;" \ - -e "s; \/usr\/lib\/libdirect.la ; $(SYSROOT)\/usr\/lib\/libdirect.la ;" \ - -e "s; \/usr\/lib\/libdirectfb.la ; $(SYSROOT)\/usr\/lib\/libdirectfb.la ;" \ - < $(SYSROOT)/usr/lib/libdirectfb.la > libdirectfb.la.new; \ - mv libdirectfb.la.new $(SYSROOT)/usr/lib/libdirectfb.la + -e "s; \/usr\/lib\/libfusion.la ; $(embtk_sysroot)\/usr\/lib\/libfusion.la ;" \ + -e "s; \/usr\/lib\/libdirect.la ; $(embtk_sysroot)\/usr\/lib\/libdirect.la ;" \ + -e "s; \/usr\/lib\/libdirectfb.la ; $(embtk_sysroot)\/usr\/lib\/libdirectfb.la ;" \ + < $(embtk_sysroot)/usr/lib/libdirectfb.la > libdirectfb.la.new; \ + mv libdirectfb.la.new $(embtk_sysroot)/usr/lib/libdirectfb.la endif diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index 15e4a28..5ee81a6 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -37,8 +37,8 @@ FONTCONFIG_INCLUDES = fontconfig FONTCONFIG_LIBS = libfontconfig* FONTCONFIG_PKGCONFIGS = fontconfig.pc -LIBXML2_CFLAGS-y = -I$(SYSROOT)/usr/include/libxml2 -LIBXML2_LIBS-y = -L$(SYSROOT)/usr/$(LIBDIR) -lxml2 +LIBXML2_CFLAGS-y = -I$(embtk_sysroot)/usr/include/libxml2 +LIBXML2_LIBS-y = -L$(embtk_sysroot)/usr/$(LIBDIR) -lxml2 FREETYPE_CFLAGS-y = $(shell \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ @@ -66,5 +66,5 @@ FONTCONFIG_MAKE_OPTS += FREETYPE_LIBS="$(FREETYPE_LIBS-y)" FONTCONFIG_DEPS := libxml2_install freetype_install define embtk_postinstall_fontconfig - $(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/ + $(Q)-cp -R $(embtk_sysroot)/usr/etc/fonts $(ROOTFS)/etc/ endef diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk index db24cb2..dd8bff3 100644 --- a/packages/graphics/gtk/gtk.mk +++ b/packages/graphics/gtk/gtk.mk @@ -59,33 +59,33 @@ GTK_CONFIGURE_OPTS += LIBPNG=-lpng define embtk_postinstall_gtk $(Q)test -e $(GTK_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(GTK_BUILD_DIR)/.patchlibtool - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ endef $(GTK_BUILD_DIR)/.patchlibtool: ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - GTK_LT_FILES=`find $(SYSROOT)/usr/lib32/ -type f -name *.la`; \ + GTK_LT_FILES=`find $(embtk_sysroot)/usr/lib32/ -type f -name *.la`; \ for i in $$GTK_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib32\/libgtk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib32\/libgtk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib32\/libgdk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib32\/libgdk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib32\/libgdk_pixbuf-2.0.la ; $(SYSROOT)\/usr\/lib32\/libgdk_pixbuf-2.0.la ;" \ - -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgtk-x11-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk-x11-2.0.la ;" \ + -e "s; \/usr\/lib32\/libgtk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib32\/libgtk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib32\/libgdk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib32\/libgdk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib32\/libgdk_pixbuf-2.0.la ; $(embtk_sysroot)\/usr\/lib32\/libgdk_pixbuf-2.0.la ;" \ + -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgtk-x11-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk-x11-2.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done else - GTK_LT_FILES=`find $(SYSROOT)/usr/lib/ -type f -name *.la`; \ + GTK_LT_FILES=`find $(embtk_sysroot)/usr/lib/ -type f -name *.la`; \ for i in $$GTK_LT_FILES; \ do \ sed \ - -e "s; \/usr\/lib\/libgtk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib\/libgtk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk-directfb-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk-directfb-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk_pixbuf-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk_pixbuf-2.0.la ;" \ - -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgtk-x11-2.0.la ;" \ - -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(SYSROOT)\/usr\/lib\/libgdk-x11-2.0.la ;" \ + -e "s; \/usr\/lib\/libgtk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgtk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk-directfb-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk-directfb-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk_pixbuf-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk_pixbuf-2.0.la ;" \ + -e "s; \/usr\/lib\/libgtk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgtk-x11-2.0.la ;" \ + -e "s; \/usr\/lib\/libgdk-x11-2.0.la ; $(embtk_sysroot)\/usr\/lib\/libgdk-x11-2.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk index b3cb0e6..1503bec 100644 --- a/packages/graphics/imlib2/imlib2.mk +++ b/packages/graphics/imlib2/imlib2.mk @@ -43,7 +43,7 @@ IMLIB2_DEPS := libpng_install freetype_install libjpeg_install define embtk_postinstall_imlib2 $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(SYSROOT)/usr/share/imlib2 $(ROOTFS)/usr/share + $(Q)-cp -R $(embtk_sysroot)/usr/share/imlib2 $(ROOTFS)/usr/share endef diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk index 0b2632c..e1300f6 100644 --- a/packages/graphics/pango/pango.mk +++ b/packages/graphics/pango/pango.mk @@ -51,16 +51,16 @@ PANGO_DEPS := glib_install fontconfig_install $(PANGO_DEPS-y) \ define embtk_postinstall_pango $(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ + $(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ endef $(PANGO_BUILD_DIR)/.patchlibtool: - $(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/* -type f -name *.la`; \ + $(Q)PANGO_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/* -type f -name *.la`; \ for i in $$PANGO_LT_FILES; \ do \ sed \ - -e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(SYSROOT)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \ - -e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(SYSROOT)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \ + -e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \ + -e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \ < $$i > $$i.new; \ mv $$i.new $$i; \ done |