diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-28 15:37:49 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-28 15:37:49 +0200 |
| commit | 305b54a1a103f33f552c9693fbe1a0b801855c9c (patch) | |
| tree | 59dc9be69d2b1d16649272efc2dcc5bc8c71ffd3 /packages/x11/libx11 | |
| parent | 53b4522531e73e8546592ed5713d6933f35fd6c0 (diff) | |
| download | embtoolkit-305b54a1a103f33f552c9693fbe1a0b801855c9c.tar.gz embtoolkit-305b54a1a103f33f552c9693fbe1a0b801855c9c.tar.bz2 embtoolkit-305b54a1a103f33f552c9693fbe1a0b801855c9c.tar.xz | |
Packages: massively convert to use generic macros and implicit rules
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/x11/libx11')
| -rw-r--r-- | packages/x11/libx11/libx11.mk | 86 |
1 files changed, 31 insertions, 55 deletions
diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk index c50392c..b24aa6d 100644 --- a/packages/x11/libx11/libx11.mk +++ b/packages/x11/libx11/libx11.mk @@ -23,58 +23,43 @@ # \date March 2010 ################################################################################ -LIBX11_NAME := libX11 -LIBX11_VERSION := $(call embtk_get_pkgversion,LIBX11) -LIBX11_SITE := http://xorg.freedesktop.org/archive/individual/lib -LIBX11_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -LIBX11_PACKAGE := libX11-$(LIBX11_VERSION).tar.bz2 -LIBX11_SRC_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION) -LIBX11_BUILD_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION) +LIBX11_NAME := libX11 +LIBX11_VERSION := $(call embtk_get_pkgversion,libx11) +LIBX11_SITE := http://xorg.freedesktop.org/archive/individual/lib +LIBX11_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +LIBX11_PACKAGE := libX11-$(LIBX11_VERSION).tar.bz2 +LIBX11_SRC_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION) +LIBX11_BUILD_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION) -LIBX11_BINS = -LIBX11_SBINS = -LIBX11_INCLUDES = X11/cursorfont.h X11/ImUtil.h X11/Xcms.h X11/XKBlib.h \ - X11/XlibConf.h X11/Xlib.h X11/Xlibint.h X11/Xlib-xcb.h \ - X11/Xlocale.h X11/Xregion.h X11/Xresource.h X11/Xutil.h -LIBX11_LIBS = libX11* X11/Xcms.txt -LIBX11_PKGCONFIGS = x11.pc x11-xcb.pc +LIBX11_BINS = +LIBX11_SBINS = +LIBX11_INCLUDES = X11/cursorfont.h X11/ImUtil.h X11/Xcms.h X11/XKBlib.h \ + X11/XlibConf.h X11/Xlib.h X11/Xlibint.h X11/Xlib-xcb.h \ + X11/Xlocale.h X11/Xregion.h X11/Xresource.h X11/Xutil.h +LIBX11_LIBS = libX11* X11/Xcms.txt +LIBX11_PKGCONFIGS = x11.pc x11-xcb.pc -LIBX11_CONFIGURE_OPTS := --with-xcb --without-xmlto --without-ps2pdf \ - --without-groff --disable-malloc0returnsnull \ - --disable-loadable-xcursor +LIBX11_CONFIGURE_OPTS := --with-xcb --without-xmlto --without-ps2pdf \ + --without-groff --disable-malloc0returnsnull \ + --disable-loadable-xcursor -LIBX11_DEPS = utilmacros_install inputproto_install kbproto_install \ +LIBX11_DEPS = utilmacros_install inputproto_install kbproto_install \ xextproto_install xproto_install libxcb_install xtrans_install -libx11_install: - @test -e $(LIBX11_BUILD_DIR)/.installed || \ - $(MAKE) $(LIBX11_BUILD_DIR)/.installed - $(Q)$(MAKE) $(LIBX11_BUILD_DIR)/.special +define embtk_beforeinstall_libx11 + $(Q)cd $(LIBX11_BUILD_DIR)/src/util; \ + $(HOSTCC_CACHED) makekeys.c -c -o makekeys-makekeys.o; \ + $(HOSTCC_CACHED) makekeys.c -o makekeys +endef -$(LIBX11_BUILD_DIR)/.installed: $(LIBX11_DEPS) download_libx11 \ - $(LIBX11_BUILD_DIR)/.decompressed $(LIBX11_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - libx11-$(LIBX11_VERSION) in your root filesystem...") - @cd $(LIBX11_BUILD_DIR)/src/util; \ - gcc makekeys.c -c -o makekeys-makekeys.o; gcc makekeys.c -o makekeys - $(Q)$(MAKE) -C $(LIBX11_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(LIBX11_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)$(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool - @touch $@ - -download_libx11: - $(call embtk_download_pkg,LIBX11) - -$(LIBX11_BUILD_DIR)/.decompressed: - $(call embtk_decompress_pkg,LIBX11) - -$(LIBX11_BUILD_DIR)/.configured: - $(call embtk_configure_pkg,LIBX11) - -libx11_clean: - $(call embtk_cleanup_pkg,LIBX11) +define embtk_postinstall_libx11 + $(Q)test -e $(LIBX11_BUILD_DIR)/.patchlibtool || \ + $(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool + $(Q)-mkdir -p $(ROOTFS)/usr/share + $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 + $(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ + $(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ +endef $(LIBX11_BUILD_DIR)/.patchlibtool: @LIBX11_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \ @@ -83,12 +68,3 @@ $(LIBX11_BUILD_DIR)/.patchlibtool: sed \ -i "s; /usr/$(LIBDIR)/libX11.la ; $(SYSROOT)/usr/$(LIBDIR)/libX11.la ;" $$i; \ done - -.PHONY: $(LIBX11_BUILD_DIR)/.special - -$(LIBX11_BUILD_DIR)/.special: - $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ - $(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ - @touch $@ |