gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rdesktop: convert to Makefile.autotools.in format

Browse Source 
And also adapt X depency. Rdesktop only needs libX11/Xt, and long term
we should be able to use the X stuff without having a X server on the
target.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-02-08 21:05:38 +01:00
parent 5223447b8b
commit 5d4aeeda7e
3 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -10,8 +10,8 @@
e2fsprogs, gstreamer, gperf, gst-plugins-bad, gvfs, fbdump, flex, hal,
iptables, iw, jpeg, kismet, libfuse, libglib2, libpcap, libungif,
libxml2, libxslt, lighttpd, mesa, mpg123, mtd-utils, newt, nbd, neon,
netstat-nat, openvpn, pcre, php, qt, readline, rpm, sawman, sdl,
sdl_ttf, sqlite, sshfs, tremor, u-boot, usb_modeswitch, usbutils,
netstat-nat, openvpn, pcre, php, qt, rdesktop, readline, rpm, sawman,
sdl, sdl_ttf, sqlite, sshfs, tremor, u-boot, usb_modeswitch, usbutils,
webkit, wpa_supplicant, xfsprogs, zlib
Removed package: openswan

2
package/rdesktop/Config.in
View File

@ -1,6 +1,8 @@
config BR2_PACKAGE_RDESKTOP
bool "rdesktop"
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXT
depends on BR2_PACKAGE_XORG7
help
rdesktop is an open source client for Windows NT Terminal

59
package/rdesktop/rdesktop.mk
View File

@ -4,55 +4,12 @@
#
#############################################################
RDESKTOP_VERSION=1.5.0
RDESKTOP_SOURCE=rdesktop-$(RDESKTOP_VERSION).tar.gz
RDESKTOP_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/rdesktop/
RDESKTOP_DIR=$(BUILD_DIR)/rdesktop-$(RDESKTOP_VERSION)
RDESKTOP_CAT:=$(ZCAT)
RDESKTOP_VERSION = 1.5.0
RDESKTOP_SOURCE = rdesktop-$(RDESKTOP_VERSION).tar.gz
RDESKTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/rdesktop/
# no install-strip / install-exec
RDESKTOP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
$(DL_DIR)/$(RDESKTOP_SOURCE):
$(call DOWNLOAD,$(RDESKTOP_SITE),$(RDESKTOP_SOURCE))
$(RDESKTOP_DIR)/.unpacked: $(DL_DIR)/$(RDESKTOP_SOURCE)
$(RDESKTOP_CAT) $(DL_DIR)/$(RDESKTOP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(RDESKTOP_DIR) package/rdesktop/ \*.patch*
touch $(RDESKTOP_DIR)/.unpacked
$(RDESKTOP_DIR)/.configured: $(RDESKTOP_DIR)/.unpacked
(cd $(RDESKTOP_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
./configure $(QUIET) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--with-openssl=$(STAGING_DIR)/usr \
--sysconfdir=/etc \
)
touch $(RDESKTOP_DIR)/.configured
$(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(RDESKTOP_DIR)
$(TARGET_DIR)/usr/bin/rdesktop: $(RDESKTOP_DIR)/rdesktop
cp $^ $@
rdesktop: openssl xserver_xorg-server $(TARGET_DIR)/usr/bin/rdesktop
rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
rdesktop-clean:
-$(MAKE) -C $(RDESKTOP_DIR) clean
rm -f $(TARGET_DIR)/usr/bin/rdesktop
rdesktop-dirclean:
rm -rf $(RDESKTOP_DIR) $(RDESKTOP_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_RDESKTOP),y)
TARGETS+=rdesktop
endif
$(eval $(call AUTOTARGETS,package,rdesktop))