From e337d002fe4f258897f9d7ac5292e243b88b4cfd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 20 Oct 2008 11:53:16 +0000 Subject: package/: remove redundant install-strip in *_TARGET_INSTALL_OPT It's default now. --- package/audio/speex/speex.mk | 1 - package/blackbox/blackbox.mk | 1 - package/ethtool/ethtool.mk | 2 -- package/fbdump/fbdump.mk | 1 - package/fontconfig/fontconfig.mk | 2 -- package/haserl/haserl.mk | 2 ++ package/iperf/iperf.mk | 1 - package/iptables/iptables.mk | 1 - package/libconfig/libconfig.mk | 1 - package/libconfuse/libconfuse.mk | 1 - package/libdaemon/libdaemon.mk | 1 - package/libupnp/libupnp.mk | 1 - package/libxml2/libxml2.mk | 1 - package/netcat/netcat.mk | 1 - package/pcre/pcre.mk | 1 - package/pixman/pixman.mk | 2 -- package/popt/popt.mk | 1 - package/psmisc/psmisc.mk | 1 - package/rsync/rsync.mk | 2 ++ package/sawman/sawman.mk | 4 ++++ package/sdl_net/sdl_net.mk | 1 - package/x11r7/xlib_libX11/xlib_libX11.mk | 2 -- package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 -- package/x11r7/xlib_libXext/xlib_libXext.mk | 2 -- package/x11r7/xlib_libXfont/xlib_libXfont.mk | 2 -- package/x11r7/xlib_libXft/xlib_libXft.mk | 2 -- package/x11r7/xlib_libXi/xlib_libXi.mk | 2 -- package/x11r7/xlib_libXt/xlib_libXt.mk | 2 -- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 1 - 29 files changed, 8 insertions(+), 36 deletions(-) (limited to 'package') diff --git a/package/audio/speex/speex.mk b/package/audio/speex/speex.mk index 31b0b63c5..516781c11 100644 --- a/package/audio/speex/speex.mk +++ b/package/audio/speex/speex.mk @@ -9,7 +9,6 @@ SPEEX_SITE=http://downloads.us.xiph.org/releases/speex SPEEX_AUTORECONF = NO SPEEX_INSTALL_STAGING = YES SPEEX_INSTALL_TARGET = YES -SPEEX_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip SPEEX_DEPENDENCIES = libogg SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \ --with-ogg-includes=$(STAGING_DIR)/usr/include \ diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk index 9c0453820..a85c7535b 100644 --- a/package/blackbox/blackbox.mk +++ b/package/blackbox/blackbox.mk @@ -10,7 +10,6 @@ BLACKBOX_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/b BLACKBOX_AUTORECONF:=NO BLACKBOX_INSTALL_STAGING:=NO BLACKBOX_INSTALL_TARGET:=YES -BLACKBOX_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 876bbc7c2..7ebae5212 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -10,8 +10,6 @@ ETHTOOL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gk ETHTOOL_AUTORECONF:=no ETHTOOL_INSTALL_STAGING:=NO ETHTOOL_INSTALL_TARGET:=YES -ETHTOOL_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip -ETHTOOL_UNINSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) uninstall ETHTOOL_DEPENDENCIES:=uclibc diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk index 0de9fe552..9dcb7cd0f 100644 --- a/package/fbdump/fbdump.mk +++ b/package/fbdump/fbdump.mk @@ -9,7 +9,6 @@ FBDUMP_SITE:=http://www.rcdrummond.net/fbdump FBDUMP_AUTORECONF = NO FBDUMP_CONF_ENV = ac_cv_func_malloc_0_nonnull=yes FBDUMP_INSTALL_TARGET = YES -FBDUMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip $(eval $(call AUTOTARGETS,package,fbdump)) diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 8ad14a275..4ed9985b6 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -10,8 +10,6 @@ FONTCONFIG_AUTORECONF = NO FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_INSTALL_TARGET = YES -FONTCONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip - FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \ --with-freetype-config="$(STAGING_DIR)/usr/bin/freetype-config" \ --with-expat="$(STAGING_DIR)/usr/lib" \ diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index d2266af12..978f30bba 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -11,7 +11,9 @@ HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/has HASERL_AUTORECONF:=no HASERL_INSTALL_STAGING:=NO HASERL_INSTALL_TARGET:=YES +ifeq ($(BR2_ENABLE_DEBUG),) HASERL_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' install-strip +endif # force haserl 0.8.0 to use install-sh so stripping works HASERL_CONF_ENV = ac_cv_path_install=./install-sh diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 31436caa8..8defff2d7 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -10,7 +10,6 @@ IPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iper IPERF_AUTORECONF:=NO IPERF_INSTALL_STAGING:=NO IPERF_INSTALL_TARGET:=YES -IPERF_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip IPERF_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes IPERF_CONF_OPT:=--disable-dependency-tracking --disable-web100 $(DISABLE_IPV6) diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 5cc98e2a1..fe9a9f6af 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -9,7 +9,6 @@ IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables IPTABLES_CONF_OPT = --libexecdir=/usr/lib IPTABLES_INSTALL_TARGET = YES -IPTABLES_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip IPTABLES_AUTORECONF = YES IPTABLES_DEPENDENCIES = diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk index 8e7ef0b5c..eb427ef03 100644 --- a/package/libconfig/libconfig.mk +++ b/package/libconfig/libconfig.mk @@ -9,7 +9,6 @@ LIBCONFIG_SITE:=http://www.hyperrealm.com/libconfig/ LIBCONFIG_AUTORECONF:=NO LIBCONFIG_INSTALL_STAGING:=YES LIBCONFIG_INSTALL_TARGET:=YES -LIBCONFIG_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip ifneq ($(BR2_INSTALL_LIBSTDCPP),y) LIBCONFIG_CONF_OPT:=--disable-cxx diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index f6220dbfc..552b7c73e 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -9,7 +9,6 @@ LIBCONFUSE_SITE:=http://bzero.se/confuse/ LIBCONFUSE_AUTORECONF:=NO LIBCONFUSE_INSTALL_STAGING:=YES LIBCONFUSE_INSTALL_TARGET:=YES -LIBCONFUSE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath $(DISABLE_NLS) diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index 887d1737e..39e39fc24 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -10,7 +10,6 @@ LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/ LIBDAEMON_AUTORECONF:=no LIBDAEMON_INSTALL_STAGING:=YES LIBDAEMON_INSTALL_TARGET:=YES -LIBDAEMON_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no LIBDAEMON_CONF_OPT:=--disable-lynx $(DISABLE_NLS) $(DISABLE_LARGEFILE) diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 9cd2e7f82..e98799e95 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -8,6 +8,5 @@ LIBUPNP_SOURCE:=libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pupnp LIBUPNP_INSTALL_STAGING:=YES -LIBUPNP_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip $(eval $(call AUTOTARGETS,package,libupnp)) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index c6eab9d20..5c31087a0 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -8,7 +8,6 @@ LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz LIBXML2_SITE = ftp://xmlsoft.org/libxml2 LIBXML2_INSTALL_STAGING = YES LIBXML2_INSTALL_TARGET = YES -LIBXML2_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip ifneq ($(BR2_LARGEFILE),y) LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 73bc11ce1..9c19be2b3 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -10,7 +10,6 @@ NETCAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/netc NETCAT_AUTORECONF:=NO NETCAT_INSTALL_STAGING:=NO NETCAT_INSTALL_TARGET:=YES -NETCAT_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip NETCAT_CONF_OPT:= $(DISABLE_NLS) NETCAT_DEPENDENCIES = uclibc diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index 414f12e4b..dd473b491 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -8,7 +8,6 @@ PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre PCRE_INSTALL_STAGING = YES PCRE_INSTALL_TARGET = YES -PCRE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # pcre will use the host g++ if a cross version isn't available diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 4cba0d06c..ba8e80d07 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -8,7 +8,5 @@ PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz PIXMAN_SITE = http://cairographics.org/releases/ PIXMAN_AUTORECONF = NO PIXMAN_INSTALL_STAGING = YES -PIXMAN_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install -PIXMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip $(eval $(call AUTOTARGETS,package,pixman)) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index e35b917c3..b2f7c8b4a 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -8,7 +8,6 @@ POPT_SITE:=http://rpm5.org/files/popt POPT_INSTALL_STAGING:=YES POPT_INSTALL_TARGET:=YES POPT_CONF_ENV:=ac_cv_va_copy=yes -POPT_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip POPT_DEPENDENCIES:=uclibc diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index e89214748..ce5566728 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -9,7 +9,6 @@ PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psm PSMISC_AUTORECONF:=no PSMISC_INSTALL_STAGING:=no PSMISC_INSTALL_TARGET:=YES -PSMISC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes PSMISC_CONF_OPT:= $(DISABLE_NLS) $(DISABLE_IPV6) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index ef18efc85..d171f94b4 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -10,8 +10,10 @@ RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src RSYNC_AUTORECONF:=no RSYNC_INSTALL_STAGING:=NO RSYNC_INSTALL_TARGET:=YES +ifeq ($(BR2_ENABLE_DEBUG),) RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \ STRIPPROG="$(TARGET_STRIP)" install-strip +endif RSYNC_CONF_OPT:=--with-included-popt RSYNC_DEPENDENCIES:=uclibc diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk index 495687820..c2d4b7a80 100644 --- a/package/sawman/sawman.mk +++ b/package/sawman/sawman.mk @@ -9,7 +9,11 @@ SAWMAN_SITE:=http://www.directfb.org/downloads/Extras SAWMAN_INSTALL_STAGING = YES SAWMAN_INSTALL_TARGET = YES SAWMAN_CONF_ENV = LDFLAGS="-L$(STAGING_DIR)/usr/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib" +ifeq ($(BR2_ENABLE_DEBUG),y) +SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install +else SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install-strip +endif SAWMAN_DEPENDENCIES = directfb $(eval $(call AUTOTARGETS,package,sawman)) diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk index 57cd259f6..b4ef45c40 100644 --- a/package/sdl_net/sdl_net.mk +++ b/package/sdl_net/sdl_net.mk @@ -11,7 +11,6 @@ SDL_NET_CONF_OPT = --localstatedir=/var \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr SDL_NET_INSTALL_STAGING = YES -SDL_NET_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip SDL_NET_DEPENDENCIES = sdl diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 60fe45132..9e464d5d0 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -9,8 +9,6 @@ XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBX11_AUTORECONF = NO XLIB_LIBX11_INSTALL_STAGING = YES -XLIB_LIBX11_INSTALL_TARGET = YES -XLIB_LIBX11_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include" XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index a2331af2e..7864f71d0 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -9,8 +9,6 @@ XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAW_AUTORECONF = NO XLIB_LIBXAW_INSTALL_STAGING = YES -XLIB_LIBXAW_INSTALL_TARGET = YES -XLIB_LIBXAW_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp XLIB_LIBXAW_CONF_OPT = --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk index 5f93669a0..33e4c6bd7 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -9,8 +9,6 @@ XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXEXT_AUTORECONF = NO XLIB_LIBXEXT_INSTALL_STAGING = YES -XLIB_LIBXEXT_INSTALL_TARGET = YES -XLIB_LIBXEXT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index 5e57bdc3c..58682c8c3 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -9,8 +9,6 @@ XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT_AUTORECONF = NO XLIB_LIBXFONT_INSTALL_STAGING = YES -XLIB_LIBXFONT_INSTALL_TARGET = YES -XLIB_LIBXFONT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 34c8baebc..8a2f049f7 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -9,8 +9,6 @@ XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFT_AUTORECONF = NO XLIB_LIBXFT_INSTALL_STAGING = YES -XLIB_LIBXFT_INSTALL_TARGET = YES -XLIB_LIBXFT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index 00b636bf6..002a4d3d0 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -9,8 +9,6 @@ XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_AUTORECONF = NO XLIB_LIBXI_INSTALL_STAGING = YES -XLIB_LIBXI_INSTALL_TARGET = YES -XLIB_LIBXI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index e478780d0..7e281c684 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -9,8 +9,6 @@ XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_AUTORECONF = NO XLIB_LIBXT_INSTALL_STAGING = YES -XLIB_LIBXT_INSTALL_TARGET = YES -XLIB_LIBXT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include" XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static --disable-install-makestrs diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 9cf7afaae..c4fa500e7 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -52,7 +52,6 @@ XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) \ CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data -XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip # Optional packages ifeq ($(strip $(BR2_PACKAGE_TSLIB)),y) -- cgit v1.2.3