diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
| commit | 441c122606e3a921a947f4126a414c9974d64533 (patch) | |
| tree | a6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/java | |
| parent | 8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff) | |
| parent | 74ecbaa23da486182a1bb20b43361aaf2a478877 (diff) | |
| download | buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.tar.gz buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.zip | |
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/java')
| -rw-r--r-- | package/java/classpath/classpath.mk | 4 | ||||
| -rw-r--r-- | package/java/jamvm/jamvm.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index 71c18a045..d037adfe6 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -77,8 +77,8 @@ else CLASSPATH_CONF_OPT+= --disable-gtk-peer endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - CLASSPATH_DEPENDENCIES+= $(XSERVER) +ifeq ($(BR2_PACKAGE_XORG7),y) + CLASSPATH_DEPENDENCIES+= xserver_xorg-server CLASSPATH_CONF_OPT+= --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk index dff089af4..750bfae23 100644 --- a/package/java/jamvm/jamvm.mk +++ b/package/java/jamvm/jamvm.mk @@ -52,8 +52,8 @@ JAMVM_CONF_OPT = \ JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath #Include X libraries when we have an X server -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - JAMVM_DEPENDENCIES+= $(XSERVER) +ifeq ($(BR2_PACKAGE_XORG7),y) + JAMVM_DEPENDENCIES+= xserver_xorg-server JAMVM_CONF_OPT+= --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib |