resolve merge conflict

mk/build.mk

@@ -17,6 +17,7 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_GCC=n \
+			ADK_PACKAGE_AUFS2_UTIL=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_COMPILE_HEIMDAL=n \
 			ADK_PACKAGE_HEIMDAL_PKINIT=n \

mk/fetch.mk

@@ -31,7 +31,7 @@ _CHECKSUM_COOKIE?=	${WRKDIR}/.checksum_done
 checksum: ${_CHECKSUM_COOKIE}
 ifeq ($(strip ${NO_CHECKSUM}),)
 ${_CHECKSUM_COOKIE}: ${FULLDISTFILES}
-	rm -rf ${WRKDIR}
+	-rm -rf ${WRKDIR}
 	@OK=n; \
 	(md5sum ${FULLDISTFILES}; echo exit) | while read sum name; do \
 		if [[ $$sum = exit ]]; then \

package/aufs2-util/Makefile

@@ -15,14 +15,14 @@ NO_DISTFILES:=		1
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 MAKE_FLAGS+=		KDIR=${LINUX_DIR}
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin
+	$(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin
 	$(INSTALL_BIN) ${WRKINST}/sbin/{u,}mount.aufs \
-		$(IDIR_AUFS_UTIL)/sbin
+		$(IDIR_AUFS2_UTIL)/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/automake/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
 PKG_VERSION:=		1.10
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		452163c32d061c53a7acc0e8c1b689ba
 PKG_DESCR:=		GNU automake
 PKG_SECTION:=		utils

package/automake/patches/patch-Makefile_am

@@ -0,0 +1,11 @@
+--- automake-1.10.orig/Makefile.am	2006-08-22 12:01:20.000000000 +0200
++++ automake-1.10/Makefile.am	2010-02-23 19:48:10.927027207 +0100
+@@ -24,7 +24,7 @@
+ ## automake (run in doc, tests, and in the rebuild rules.)
+ ## `.' goes before doc and tests, because the latter two directories
+ ## run aclocal and automake.
+-SUBDIRS = lib . doc m4 tests
++SUBDIRS = lib . m4
+ 
+ bin_SCRIPTS = automake aclocal
+ 

package/automake/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- automake-1.10.orig/Makefile.in	2006-10-15 19:25:23.000000000 +0200
++++ automake-1.10/Makefile.in	2010-02-23 19:50:59.178535678 +0100
+@@ -162,7 +162,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib . doc m4 tests
++SUBDIRS = lib . m4
+ bin_SCRIPTS = automake aclocal
+ CLEANFILES = $(bin_SCRIPTS)
+ AUTOMAKESOURCES = automake.in aclocal.in

package/base-files/Makefile

@@ -26,7 +26,8 @@ INSTALL_STYLE:=		manual
 
 do-install:
 	$(CP) ./src/* $(IDIR_BASE_FILES)
-	$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
+	# allow this to fail, as there might be no target-specific files to copy
+	-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
 ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
 	@-rm $(IDIR_BASE_FILES)/etc/network/interfaces
 endif

package/bison/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- bison-2.4.1.orig/Makefile.in	2008-12-11 23:05:53.000000000 +0100
++++ bison-2.4.1/Makefile.in	2010-02-23 20:11:17.748535777 +0100
+@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
++SUBDIRS = build-aux po runtime-po lib data src etc
+ aclocal_DATA = m4/bison-i18n.m4
+ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
+   OChangeLog PACKAGING \

package/bison/patches/patch-lib_config_hin

@@ -0,0 +1,12 @@
+--- bison-2.4.1.orig/lib/config.hin	2008-12-11 23:05:52.000000000 +0100
++++ bison-2.4.1/lib/config.hin	2010-02-23 20:09:49.477285615 +0100
+@@ -399,6 +399,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 

package/esound/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		net
@@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ESOUND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--disable-alsa
+
 post-install:
 	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/

package/esound/files/esd.init

@@ -9,7 +9,7 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	esd -d /dev/sound/dsp -public -tcp -nobeeps
+	esd -public -tcp -nobeeps -noterminate &
 	;;
 stop)
 	pkill esd

package/gawk/patches/patch-Makefile_in

@@ -0,0 +1,12 @@
+--- gawk-3.1.7.orig/Makefile.in	2009-07-21 21:29:59.000000000 +0200
++++ gawk-3.1.7/Makefile.in	2010-02-23 21:42:10.887094938 +0100
+@@ -364,8 +364,7 @@ SUBDIRS = \
+ 	. \
+ 	awklib \
+ 	doc \
+-	po \
+-	test
++	po
+ 
+ 
+ # sources for both gawk and pgawk

package/gawk/patches/patch-configh_in

@@ -0,0 +1,45 @@
+--- gawk-3.1.7.orig/configh.in	2009-07-21 21:30:16.000000000 +0200
++++ gawk-3.1.7/configh.in	2010-02-23 21:33:27.689776531 +0100
+@@ -227,10 +227,10 @@
+ /* Define to 1 if you have the `strtoul' function. */
+ #undef HAVE_STRTOUL
+ 
+-/* Define to 1 if `st_blksize' is member of `struct stat'. */
++/* Define to 1 if `struct stat' is a member of `st_blksize'. */
+ #undef HAVE_STRUCT_STAT_ST_BLKSIZE
+ 
+-/* Define to 1 if `tm_zone' is member of `struct tm'. */
++/* Define to 1 if `struct tm' is a member of `tm_zone'. */
+ #undef HAVE_STRUCT_TM_TM_ZONE
+ 
+ /* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
+@@ -345,6 +345,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+@@ -452,13 +455,14 @@
+    nothing if this is not supported.  Do not define if restrict is
+    supported directly.  */
+ #undef restrict
+-/* Work around a bug in Sun C++: it does not support _Restrict, even
+-   though the corresponding Sun C compiler does, which causes
+-   "#define restrict _Restrict" in the previous line.  Perhaps some future
+-   version of Sun C++ will work with _Restrict; if so, it'll probably
+-   define __RESTRICT, just as Sun C does.  */
++/* Work around a bug in Sun C++: it does not support _Restrict or
++   __restrict__, even though the corresponding Sun C compiler ends up with
++   "#define restrict _Restrict" or "#define restrict __restrict__" in the
++   previous line.  Perhaps some future version of Sun C++ will work with
++   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+ #if defined __SUNPRO_CC && !defined __RESTRICT
+ # define _Restrict
++# define __restrict__
+ #endif
+ 
+ /* Define to `unsigned int' if <sys/types.h> does not define. */

package/gawk/patches/patch-test_Maketests

@@ -0,0 +1,1031 @@
+--- gawk-3.1.7.orig/test/Maketests	2009-07-03 11:31:17.000000000 +0200
++++ gawk-3.1.7/test/Maketests	2010-02-23 21:33:39.639777383 +0100
+@@ -1,1028 +0,0 @@
+-Gt-dummy:
+-# file Maketests, generated from Makefile.am by the Gentests program
+-addcomma:
+-	@echo addcomma
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-anchgsub:
+-	@echo anchgsub
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arrayparm:
+-	@echo arrayparm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arrayprm2:
+-	@echo arrayprm2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arrayprm3:
+-	@echo arrayprm3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arrayref:
+-	@echo arrayref
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arrymem1:
+-	@echo arrymem1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arryref2:
+-	@echo arryref2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arryref3:
+-	@echo arryref3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arryref4:
+-	@echo arryref4
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arryref5:
+-	@echo arryref5
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arynasty:
+-	@echo arynasty
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm1:
+-	@echo aryprm1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm2:
+-	@echo aryprm2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm3:
+-	@echo aryprm3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm4:
+-	@echo aryprm4
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm5:
+-	@echo aryprm5
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm6:
+-	@echo aryprm6
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm7:
+-	@echo aryprm7
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-aryprm8:
+-	@echo aryprm8
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-arysubnm:
+-	@echo arysubnm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-asgext:
+-	@echo asgext
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-back89:
+-	@echo back89
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-backgsub:
+-	@echo backgsub
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-childin:
+-	@echo childin
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-closebad:
+-	@echo closebad
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-clsflnam:
+-	@echo clsflnam
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-compare2:
+-	@echo compare2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-concat1:
+-	@echo concat1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-concat2:
+-	@echo concat2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-concat3:
+-	@echo concat3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-convfmt:
+-	@echo convfmt
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-datanonl:
+-	@echo datanonl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-defref:
+-	@echo defref
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-delarpm2:
+-	@echo delarpm2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-delarprm:
+-	@echo delarprm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-delfunc:
+-	@echo delfunc
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-dynlj:
+-	@echo dynlj
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-eofsplit:
+-	@echo eofsplit
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-exitval2:
+-	@echo exitval2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fldchg:
+-	@echo fldchg
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fldchgnf:
+-	@echo fldchgnf
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnamedat:
+-	@echo fnamedat
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnarray:
+-	@echo fnarray
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnarray2:
+-	@echo fnarray2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnaryscl:
+-	@echo fnaryscl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnasgnm:
+-	@echo fnasgnm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnmisc:
+-	@echo fnmisc
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fordel:
+-	@echo fordel
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-forsimp:
+-	@echo forsimp
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fsbs:
+-	@echo fsbs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fsrs:
+-	@echo fsrs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fstabplus:
+-	@echo fstabplus
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-funsemnl:
+-	@echo funsemnl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-funsmnam:
+-	@echo funsmnam
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-funstack:
+-	@echo funstack
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-getline:
+-	@echo getline
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-getline3:
+-	@echo getline3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-getnr2tb:
+-	@echo getnr2tb
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-getnr2tm:
+-	@echo getnr2tm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gsubasgn:
+-	@echo gsubasgn
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gsubtest:
+-	@echo gsubtest
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gsubtst2:
+-	@echo gsubtst2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gsubtst4:
+-	@echo gsubtst4
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gsubtst5:
+-	@echo gsubtst5
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-hex:
+-	@echo hex
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-hsprint:
+-	@echo hsprint
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-inputred:
+-	@echo inputred
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-intest:
+-	@echo intest
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-intprec:
+-	@echo intprec
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-iobug1:
+-	@echo iobug1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-leadnl:
+-	@echo leadnl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-longsub:
+-	@echo longsub
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-longwrds:
+-	@echo longwrds
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-manglprm:
+-	@echo manglprm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-math:
+-	@echo math
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-membug1:
+-	@echo membug1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-minusstr:
+-	@echo minusstr
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nasty:
+-	@echo nasty
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nasty2:
+-	@echo nasty2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-negexp:
+-	@echo negexp
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nested:
+-	@echo nested
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nfldstr:
+-	@echo nfldstr
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nfneg:
+-	@echo nfneg
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nfset:
+-	@echo nfset
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nlfldsep:
+-	@echo nlfldsep
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nlinstr:
+-	@echo nlinstr
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nlstrina:
+-	@echo nlstrina
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-noeffect:
+-	@echo noeffect
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nofmtch:
+-	@echo nofmtch
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-noloop1:
+-	@echo noloop1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-noloop2:
+-	@echo noloop2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-noparms:
+-	@echo noparms
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nulrsend:
+-	@echo nulrsend
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-numindex:
+-	@echo numindex
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-numsubstr:
+-	@echo numsubstr
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-octsub:
+-	@echo octsub
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-ofmt:
+-	@echo ofmt
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-ofmtbig:
+-	@echo ofmtbig
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-ofmtfidl:
+-	@echo ofmtfidl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-ofmts:
+-	@echo ofmts
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-onlynl:
+-	@echo onlynl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-opasnidx:
+-	@echo opasnidx
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-opasnslf:
+-	@echo opasnslf
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-paramdup:
+-	@echo paramdup
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-paramres:
+-	@echo paramres
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-paramtyp:
+-	@echo paramtyp
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-parse1:
+-	@echo parse1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-parsefld:
+-	@echo parsefld
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-parseme:
+-	@echo parseme
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-pcntplus:
+-	@echo pcntplus
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-prdupval:
+-	@echo prdupval
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-prec:
+-	@echo prec
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-printf1:
+-	@echo printf1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-prmarscl:
+-	@echo prmarscl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-prmreuse:
+-	@echo prmreuse
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-prt1eval:
+-	@echo prt1eval
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-prtoeval:
+-	@echo prtoeval
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-psx96sub:
+-	@echo psx96sub
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rand:
+-	@echo rand
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rebt8b1:
+-	@echo rebt8b1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-regeq:
+-	@echo regeq
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-reindops:
+-	@echo reindops
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-reparse:
+-	@echo reparse
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-resplit:
+-	@echo resplit
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rs:
+-	@echo rs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rsnul1nl:
+-	@echo rsnul1nl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rstest1:
+-	@echo rstest1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rstest2:
+-	@echo rstest2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rstest3:
+-	@echo rstest3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rstest4:
+-	@echo rstest4
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rstest5:
+-	@echo rstest5
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rswhite:
+-	@echo rswhite
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-scalar:
+-	@echo scalar
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-sclforin:
+-	@echo sclforin
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-sclifin:
+-	@echo sclifin
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-sortempty:
+-	@echo sortempty
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-splitargv:
+-	@echo splitargv
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-splitarr:
+-	@echo splitarr
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-splitdef:
+-	@echo splitdef
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-splitvar:
+-	@echo splitvar
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-splitwht:
+-	@echo splitwht
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-strcat1:
+-	@echo strcat1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-strnum1:
+-	@echo strnum1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-strtod:
+-	@echo strtod
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-subsepnm:
+-	@echo subsepnm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-subslash:
+-	@echo subslash
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-substr:
+-	@echo substr
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-swaplns:
+-	@echo swaplns
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-synerr1:
+-	@echo synerr1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-synerr2:
+-	@echo synerr2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-uninit2:
+-	@echo uninit2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-uninit3:
+-	@echo uninit3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-uninit4:
+-	@echo uninit4
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-uninitialized:
+-	@echo uninitialized
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-unterm:
+-	@echo unterm
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-uparrfs:
+-	@echo uparrfs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-wjposer1:
+-	@echo wjposer1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-zero2:
+-	@echo zero2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-zeroe0:
+-	@echo zeroe0
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-zeroflag:
+-	@echo zeroflag
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-getlnhd:
+-	@echo getlnhd
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-backw:
+-	@echo backw
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-clos1way:
+-	@echo clos1way
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fieldwdth:
+-	@echo fieldwdth
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fsfwfs:
+-	@echo fsfwfs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-funlen:
+-	@echo funlen
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fwtest:
+-	@echo fwtest
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fwtest2:
+-	@echo fwtest2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gensub:
+-	@echo gensub
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gensub2:
+-	@echo gensub2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-getlndir:
+-	@echo getlndir
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gnuops2:
+-	@echo gnuops2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gnuops3:
+-	@echo gnuops3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-gnureops:
+-	@echo gnureops
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-icasefs:
+-	@echo icasefs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-icasers:
+-	@echo icasers
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-igncdym:
+-	@echo igncdym
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-igncfs:
+-	@echo igncfs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-ignrcase:
+-	@echo ignrcase
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-lint:
+-	@echo lint
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-lintold:
+-	@echo lintold
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-match1:
+-	@echo match1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-match2:
+-	@echo match2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-match3:
+-	@echo match3
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-nondec:
+-	@echo nondec
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-posix:
+-	@echo posix
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-printfbad1:
+-	@echo printfbad1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-procinfs:
+-	@echo procinfs
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rebuf:
+-	@echo rebuf
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-regx8bit:
+-	@echo regx8bit
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rstest6:
+-	@echo rstest6
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-shadow:
+-	@echo shadow
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-strtonum:
+-	@echo strtonum
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-double1:
+-	@echo double1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-double2:
+-	@echo double2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-intformat:
+-	@echo intformat
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-asort:
+-	@echo asort
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-asorti:
+-	@echo asorti
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fmttest:
+-	@echo fmttest
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnarydel:
+-	@echo fnarydel
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-fnparydl:
+-	@echo fnparydl
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-rebt8b2:
+-	@echo rebt8b2
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-sort1:
+-	@echo sort1
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-sprintfc:
+-	@echo sprintfc
+-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+-
+-# end of file Maketests

package/libao/Makefile

@@ -5,24 +5,28 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libao
 PKG_VERSION:=		0.8.8
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b92cba3cbcf1ee9bc221118a85d23dcd
 PKG_DESCR:=		A cross platform audio library
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		esound
+PKG_BUILDDEP+=		esound
 PKG_URL:=		http://www.xiph.org/ao
 PKG_SITES:=		http://downloads.xiph.org/releases/ao/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--disable-esd \
+CONFIGURE_ARGS+=	--enable-esd \
 			--disable-arts \
 			--disable-nas \
 			--disable-polyp
 
 post-install:
-	${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib
+	${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib/ao/plugins-2
 	${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/
-
+	${CP} ${WRKINST}/usr/lib/ao/plugins-2/*.so \
+		${IDIR_LIBAO}/usr/lib/ao/plugins-2
+	
 include ${TOPDIR}/mk/pkg-bottom.mk

package/mpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.15.8
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		6680970274c389fd07e2b35721de1764
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		net
@@ -15,6 +15,10 @@ ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
 PKG_DEPENDS+=		alsa-lib
 PKG_BUILDDEP+=		alsa-lib
 endif
+ifneq ($(ADK_PACKAGE_MPD_WITH_AO),)
+PKG_DEPENDS+=		libao
+PKG_BUILDDEP+=		libao
+endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),)
 PKG_DEPENDS+=		libid3tag libmad
 PKG_BUILDDEP+=		libid3tag libmad
@@ -58,10 +62,11 @@ endif
 PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
-PKG_FLAVOURS:=		WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR \
+PKG_FLAVOURS:=		WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR \
 			WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG \
 			WITH_SHOUT WITH_CURL
 PKGFD_WITH_ALSA:=	enable ALSA output
+PKGFD_WITH_AO:=		enable Libao/ESD output
 PKGFD_WITH_MP3:=	enable MP3 support
 PKGFD_WITH_MP4:=	enable MP4 support
 PKGFD_WITH_OGG:=	enable OGG support
@@ -80,7 +85,6 @@ $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 TCFLAGS+=		-std=gnu99
 XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
 CONFIGURE_ARGS+=	--disable-httpd-output \
-			--disable-ao \
 			--disable-jack \
 			--disable-fifo \
 			--disable-pulse \
@@ -96,6 +100,12 @@ else
 CONFIGURE_ARGS+=	--disable-alsa
 endif
 
+ifneq (${ADK_PACKAGE_MPD_WITH_AO},)
+CONFIGURE_ARGS+=	--enable-ao
+else
+CONFIGURE_ARGS+=	--disable-ao
+endif
+
 ifneq (${ADK_PACKAGE_MPD_WITH_MP3},)
 CONFIGURE_ARGS+=	--enable-id3 --enable-mad
 else

package/mpd/files/mpd.conf

@@ -13,6 +13,13 @@ audio_output {
 	device			"hw:0,0"	# optional
 	format			"44100:16:2"	# optional
 }
+# An example of an ESD output
+#audio_output {
+#	type			"ao"
+#	driver			"esd"
+#	name			"esd"
+#}
+
 # Volume control mixer 
 mixer_type			"alsa"
 

package/mpd/files/mpd.init

@@ -1,6 +1,6 @@
 #!/bin/sh
 #PKG mpd 
-#INIT 60
+#INIT 80
 
 . /etc/rc.conf
 

package/rsync/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rsync
-PKG_VERSION:=		3.0.6
+PKG_VERSION:=		3.0.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e9865d093a18e4668b9d31b635dc8e99
+PKG_MD5SUM:=		b53525900817cf1ba7ad3a516ab5bfe9
 PKG_DESCR:=		utility that provides fast incremental file transfer
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpopt

toolchain/Makefile

@@ -7,7 +7,7 @@
 # 3) build and install gcc c compiler
 # 4) install kernel-headers
 # 5) install libc headers
-# 6) build and install full gcc 
+# 6) build and install full gcc
 # 7) build and install full libc
 # 8) build and install gdb debugger
 
@@ -38,11 +38,15 @@ clean: $(TARGETS_CLEAN)
 download: $(DOWNLOAD)
 
 gcc-prepare: binutils-install gmp-install mpfr-install
+<<<<<<< HEAD
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare
 else
 $(LIBC)-prepare: gcc-prepare kernel-headers-prepare
 endif
+=======
+$(LIBC)-prepare: gcc-prepare kernel-headers-prepare
+>>>>>>> 92de2ee1c2848fe50b9908bb679e0c9edcd4a867
 gcc-configure: $(LIBC)-prepare
 $(LIBC)-compile: gcc-configure
 gcc-compile: $(LIBC)-install

toolchain/binutils/Makefile

@@ -10,8 +10,12 @@ ifeq ($(ADK_LINUX_64),y)
 CONFOPTS+=		--enable-64-bit-bfd
 endif
 
-$(WRKBUILD)/.headers: 
-$(WRKBUILD)/.configured: 
+ifeq (${ADK_MAKE_PARALLEL},y)
+BINUTILS_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
+endif
+
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
@@ -31,7 +35,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) ${BINUTILS_MAKEOPTS} -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled

toolchain/eglibc/Makefile

@@ -31,7 +31,7 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_forced_unwind=yes \
 			libc_cv_c_cleanup=yes \
 			libc_cv_gnu99_inline=yes \
-			libc_cv_slibdir="/lib" 
+			libc_cv_slibdir="/lib"
 
 ifeq ($(ADK_TARGET_NO_FPU),y)
 EGLIBC_CONFOPTS+=       --without-fp
@@ -62,7 +62,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		install-headers install-bootstrap-headers=yes
 	touch $@
 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.configured:
 	mkdir -p $(EGLIBC_BUILD_DIR_FINAL)
 	$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
 		$(EGLIBC_BUILD_DIR_FINAL)

toolchain/gcc/Makefile

@@ -22,7 +22,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--disable-sjlj-exceptions \
 			--disable-libssp \
 			--disable-libstdcxx-pch \
-			--disable-nls 
+			--disable-nls
 
 ifeq ($(ADK_TARGET_NO_FPU),y)
 GCC_CONFOPTS+=		--with-float=soft
@@ -38,6 +38,10 @@ else
 GCC_CONFOPTS+=		--enable-tls
 endif
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GCC_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
 include ${TOPDIR}/mk/buildhlp.mk
 
 GCC_BUILD_DIR_MINIMAL:=	$(WRKBUILD)-minimal
@@ -59,7 +63,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured:
 
 $(GCC_BUILD_DIR_MINIMAL)/.compiled: $(GCC_BUILD_DIR_MINIMAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc
+	$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_MINIMAL) all-gcc
 	touch $@
 
 $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled
@@ -88,7 +92,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
 
 $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc
+	$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc
 	touch $@
 
 $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled
@@ -111,7 +115,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 
 $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_FINAL) all
+	$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_FINAL) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
@@ -126,7 +130,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		cd bin; \
 		for app in $(REAL_GNU_TARGET_NAME)-* ; do \
 			ln -sf $${app} \
-		   	$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
+				$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
 		done; \
 	)
 	touch $@

toolchain/gdb/Makefile

@@ -7,6 +7,10 @@ include Makefile.inc
 
 include ${TOPDIR}/mk/buildhlp.mk
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GDB_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
@@ -32,11 +36,11 @@ $(WRKBUILD)/.configured:
 	);
 	touch $@
 
-$(WRKBUILD)/.compiled: 
-	$(MAKE) -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}"
+$(WRKBUILD)/.compiled:
+	$(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}"
 	touch $@
 
-$(WRKBUILD)/.installed: 
+$(WRKBUILD)/.installed:
 	install -c $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb
 	cd $(STAGING_TOOLS)/bin && \
 	ln -fs $(TARGET_CROSS)gdb $(GNU_TARGET_NAME)-gdb

toolchain/glibc/Makefile

@@ -43,6 +43,10 @@ ifeq ($(ADK_TARGET_NO_FPU),y)
 GLIBC_CONFOPTS+=	--without-fp
 endif
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GLIBC_MAKEOPTS+=	PARALLELMFLAGS="-j${ADK_MAKE_JOBS}"
+endif
+
 GLIBC_BUILD_DIR_INITIAL:=	${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
@@ -59,14 +63,14 @@ $(WRKBUILD)/.headers_configure:
 
 $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib
-	-$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
+	-$(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \
 		cross-compiling=yes \
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
 	touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h
 	touch $@
 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.configured:
 	mkdir -p $(GLIBC_BUILD_DIR_FINAL)
 	(cd $(GLIBC_BUILD_DIR_FINAL); \
 		${GLIBC_ENV} \
@@ -79,7 +83,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled:
-	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) all
+	${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_FINAL) all
 	touch $@
 
 $(WRKBUILD)/.installed:

toolchain/gmp/Makefile

@@ -6,8 +6,12 @@ include ../rules.mk
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
-$(WRKBUILD)/.headers: 
-$(WRKBUILD)/.configured: 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GMP_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
@@ -20,7 +24,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) ${GMP_MAKEOPTS} -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled

toolchain/mpfr/Makefile

@@ -7,8 +7,12 @@ include $(TOPDIR)/toolchain/gmp/Makefile.inc
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
-$(WRKBUILD)/.headers: 
-$(WRKBUILD)/.configured: 
+ifeq (${ADK_MAKE_PARALLEL},y)
+MPFR_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
@@ -21,7 +25,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) ${MPFR_MAKEOPTS} -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled

toolchain/uClibc/Makefile

@@ -25,7 +25,7 @@ endif
 	touch $(WRKBUILD)/.configured
 	touch $@
 
-$(WRKBUILD)/.compiled: 
+$(WRKBUILD)/.compiled:
 	$(MAKE) -C $(WRKBUILD) \
 		PREFIX= \
 		DEVEL_PREFIX=/ \