Merge branch 'master' of git+ssh://openadk.org/git/openadk

14 files changed, 251 insertions, 173 deletions

diff --git a/.gitignore b/.gitignore
index 4f602504a..c71f2df96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /all.config
 /target_*/
 /host_*/
+/jhost/
 /pkg_*/
 /root_*/
 /bin/
@@ -40,6 +41,7 @@
 /package/*/Config.in.lib
 /package/*/Config.in.kmod
 /tools_build/
+/jtools_build/
 /extra/
 /.menu
 /target/*/Config.in.systems
diff --git a/jtools/Makefile b/jtools/Makefile
new file mode 100644
index 000000000..932cd298f
--- /dev/null
+++ b/jtools/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+TARGETS:=
+ifneq ($(ADK_PACKAGE_OPENJDK),)
+TARGETS+=fastjar gcj classpath jamvm ecj
+endif
+
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+
+all: install
+compile:
+install: $(TARGETS_INSTALL)
+clean: $(TARGETS_CLEAN)
+
+%-compile: $(TOOLS_BUILD_DIR)
+	$(TRACE) "jtools/$(patsubst %-compile,%,$@)/compile "
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile
+
+%-install:
+	$(TRACE) "jtools/$(patsubst %-install,%,$@)/install "
+	$(MAKE) -C $(patsubst %-install,%,$@) install
+
+%-clean:
+	$(TRACE) "jtools/$(patsubst %-clean,%,$@)/clean "
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
new file mode 100644
index 000000000..6d4b76d1f
--- /dev/null
+++ b/jtools/cacao/Makefile
@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		cacao
+PKG_VERSION:=		0.99.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/cacao
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+		--with-java-runtime-library=gnuclasspath \
+		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
new file mode 100644
index 000000000..059790565
--- /dev/null
+++ b/jtools/classpath/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		classpath
+PKG_VERSION:=		0.98
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
+PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr \
+		--disable-local-sockets \
+		--disable-alsa \
+		--disable-gconf-peer \
+		--disable-gtk-peer \
+		--disable-qt-peer \
+		--disable-dssi \
+		--disable-plugin \
+		--disable-examples \
+		--disable-Werror)
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD}
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
new file mode 100644
index 000000000..504c97350
--- /dev/null
+++ b/jtools/ecj/Makefile
@@ -0,0 +1,21 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ecj
+PKG_VERSION:=		1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -static -O2 -m64 -Wl,-Bsymbolic -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
+	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile
new file mode 100644
index 000000000..744776eac
--- /dev/null
+++ b/jtools/fastjar/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		fastjar
+PKG_VERSION:=		0.94
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
new file mode 100644
index 000000000..ba31c27ea
--- /dev/null
+++ b/jtools/gcj/Makefile
@@ -0,0 +1,41 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gcj
+PKG_VERSION:=		4.5.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d6559145853fbaaa0fd7556ed93bce9a
+PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
+DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
+
+WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); \
+		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
+		./configure --prefix=/usr --enable-java-home --enable-languages=java --with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) --with-mpfr=$(STAGING_HOST_DIR) \
+			--with-gmp=$(STAGING_HOST_DIR) \
+			--disable-libmudflap \
+                        --disable-libgomp \
+                        --disable-biarch \
+                        --disable-decimal-float \
+                        --disable-multilib \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
+	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
new file mode 100644
index 000000000..f02450fb0
--- /dev/null
+++ b/jtools/jamvm/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jamvm
+PKG_VERSION:=		1.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) );
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/rules.mk b/jtools/rules.mk
new file mode 100644
index 000000000..7b1d8e866
--- /dev/null
+++ b/jtools/rules.mk
@@ -0,0 +1,7 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+WRKDIR_BASE=    ${JTOOLS_BUILD_DIR}
+WRKDIR=		${WRKDIR_BASE}
+
+include ${TOPDIR}/mk/buildhlp.mk
diff --git a/mk/build.mk b/mk/build.mk
index 62c9245cf..acc0d0351 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -123,9 +123,9 @@ ifeq ($(ADK_NATIVE),y)
 	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
 else
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk toolchain/install tools/install package/compile
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile
 else
-	$(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
 
@@ -157,6 +157,9 @@ toolchain/%: ${STAGING_DIR}
 tools/%:
 	$(MAKE) -C tools $(patsubst tools/%,%,$@)
 
+jtools/%:
+	$(MAKE) -C jtools $(patsubst jtools/%,%,$@)
+
 image:
 	$(MAKE) -C target image
 
diff --git a/mk/vars.mk b/mk/vars.mk
index e5959f203..e7e6571c0 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,6 +18,7 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
+STAGING_JAVA_HOST_DIR:=	${BASE_DIR}/jhost
 # use headers and foo-config from system
 ifneq ($(ADK_NATIVE),)
 STAGING_TARGET_DIR:=
@@ -34,6 +35,7 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
+JTOOLS_BUILD_DIR=	$(BASE_DIR)/jtools_build
 TOOLS_DIR:=		$(BASE_DIR)/bin/tools
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 73812e426..e3bb8d17f 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -36,6 +36,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+
 ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
 CONFIGURE_ARGS+=	--enable-zero
 endif
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
 			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
 			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss
@@ -61,24 +61,28 @@ do-extract:
 	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
 
 pre-configure:
-	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \
+	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
+		export PATH="${PATH}:${STAGING_JAVA_HOST_DIR}/usr/bin"; \
+		export CLASSPATH="${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar:${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar";\
 		./configure \
 			--enable-bootstrap \
 			--enable-zero \
+			--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
+			--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+			--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
+			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
 			--disable-docs \
 			--disable-openjdk-cross-compilation \
-			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
-			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
 			--with-xalan2-jar=/usr/share/java/xalan.jar \
 			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
 			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
-			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss \
 	);
-	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} )
+	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE})
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure
index d9b96d1d4..6611e470e 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_configure
+++ b/package/openjdk/patches/patch-icedtea6-1_10_configure
@@ -1,7 +1,6 @@
 --- w-openjdk-6-1.orig/icedtea6-1.10/configure	2011-03-02 20:48:44.321157333 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/configure	2011-03-28 15:30:08.791808629 +0200
-@@ -10805,22 +10805,6 @@ fi
- 
++++ w-openjdk-6-1/icedtea6-1.10/configure	2011-04-01 16:12:33.091819347 +0200
+@@ -10803,25 +10803,9 @@ else
  
  
 -for ac_header in cups/cups.h cups/ppd.h
@@ -20,9 +19,10 @@
 -fi
 -
 -done
- 
+-
  for ac_header in X11/X.h
  do :
+   ac_fn_c_check_header_mongrel "$LINENO" "X11/X.h" "ac_cv_header_X11_X_h" "$ac_includes_default"
 @@ -10879,46 +10863,6 @@ else
    as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
  fi
@@ -70,164 +70,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
  $as_echo_n "checking for main in -lz... " >&6; }
-@@ -11040,156 +10984,9 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
--$as_echo_n "checking for XT... " >&6; }
--
--if test -n "$XT_CFLAGS"; then
--    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XT_LIBS"; then
--    pkg_cv_XT_LIBS="$XT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
--        else
--	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XT_PKG_ERRORS" >&5
--
--	XT_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XT_FOUND=no
--else
--	XT_CFLAGS=$pkg_cv_XT_CFLAGS
--	XT_LIBS=$pkg_cv_XT_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XT_FOUND=yes
--fi
--if test "x${XT_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xt - \
--  Try installing libXt-devel." "$LINENO" 5
--fi
--
--
--
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
--$as_echo_n "checking for XP... " >&6; }
--
--if test -n "$XP_CFLAGS"; then
--    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XP_LIBS"; then
--    pkg_cv_XP_LIBS="$XP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
- 
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
- 
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
--        else
--	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XP_PKG_ERRORS" >&5
- 
--	XP_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XP_FOUND=no
--else
--	XP_CFLAGS=$pkg_cv_XP_CFLAGS
--	XP_LIBS=$pkg_cv_XP_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XP_FOUND=yes
--fi
--if test "x${XP_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xp - \
--  Try installing libXp-devel." "$LINENO" 5
--fi
- 
- 
- 
-@@ -11271,83 +11068,6 @@ fi
+@@ -11271,83 +11215,6 @@ fi
  
  
  
@@ -311,7 +154,7 @@
  if test "x${ENABLE_XRENDER}" = "xyes"
  then
  
-@@ -11610,79 +11330,6 @@ fi
+@@ -11610,79 +11477,6 @@ fi
  
  
  
@@ -391,7 +234,7 @@
  
  
  
-@@ -11764,85 +11411,6 @@ fi
+@@ -11764,85 +11558,6 @@ fi
  
  
  
diff --git a/tools/Makefile b/tools/Makefile
index 5d0f91872..3a158b839 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,6 +4,7 @@
 include $(TOPDIR)/rules.mk
 
 TARGETS:=adk mkcrypt cpio
+
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))