aboutsummaryrefslogtreecommitdiffstats
path: root/package/x11r7
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-09-29 21:57:43 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-09-29 23:12:27 +0200
commit300f9c9c9dcf2b47ea89c45d5b1ea05e7305bd49 (patch)
tree4b06e56a40777a04ec56ba16d9b5d08fed84de08 /package/x11r7
parent0849e8193ef429f29945b8c2a54eafc8635e0969 (diff)
downloadbuildroot-novena-300f9c9c9dcf2b47ea89c45d5b1ea05e7305bd49.tar.gz
buildroot-novena-300f9c9c9dcf2b47ea89c45d5b1ea05e7305bd49.zip
package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the AUTOTARGETS macro in a way that avoids the need for each package to repeat its name and the directory in which it is present. [Peter: pkgdir->pkgparentdir] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/x11r7')
-rw-r--r--package/x11r7/libxcb/libxcb.mk4
-rw-r--r--package/x11r7/mesa3d/mesa3d.mk2
-rw-r--r--package/x11r7/pthread-stubs/pthread-stubs.mk4
-rw-r--r--package/x11r7/xapp_appres/xapp_appres.mk2
-rw-r--r--package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk4
-rw-r--r--package/x11r7/xapp_beforelight/xapp_beforelight.mk2
-rw-r--r--package/x11r7/xapp_bitmap/xapp_bitmap.mk2
-rw-r--r--package/x11r7/xapp_editres/xapp_editres.mk2
-rw-r--r--package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk2
-rw-r--r--package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk2
-rw-r--r--package/x11r7/xapp_fstobdf/xapp_fstobdf.mk2
-rw-r--r--package/x11r7/xapp_iceauth/xapp_iceauth.mk2
-rw-r--r--package/x11r7/xapp_ico/xapp_ico.mk2
-rw-r--r--package/x11r7/xapp_listres/xapp_listres.mk2
-rw-r--r--package/x11r7/xapp_luit/xapp_luit.mk2
-rw-r--r--package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk4
-rw-r--r--package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk4
-rw-r--r--package/x11r7/xapp_oclock/xapp_oclock.mk2
-rw-r--r--package/x11r7/xapp_rgb/xapp_rgb.mk2
-rw-r--r--package/x11r7/xapp_rstart/xapp_rstart.mk2
-rw-r--r--package/x11r7/xapp_scripts/xapp_scripts.mk2
-rw-r--r--package/x11r7/xapp_sessreg/xapp_sessreg.mk2
-rw-r--r--package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk2
-rw-r--r--package/x11r7/xapp_showfont/xapp_showfont.mk2
-rw-r--r--package/x11r7/xapp_smproxy/xapp_smproxy.mk2
-rw-r--r--package/x11r7/xapp_twm/xapp_twm.mk2
-rw-r--r--package/x11r7/xapp_viewres/xapp_viewres.mk2
-rw-r--r--package/x11r7/xapp_x11perf/xapp_x11perf.mk2
-rw-r--r--package/x11r7/xapp_xauth/xapp_xauth.mk2
-rw-r--r--package/x11r7/xapp_xbacklight/xapp_xbacklight.mk2
-rw-r--r--package/x11r7/xapp_xbiff/xapp_xbiff.mk2
-rw-r--r--package/x11r7/xapp_xcalc/xapp_xcalc.mk2
-rw-r--r--package/x11r7/xapp_xclipboard/xapp_xclipboard.mk2
-rw-r--r--package/x11r7/xapp_xclock/xapp_xclock.mk2
-rw-r--r--package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk2
-rw-r--r--package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk2
-rw-r--r--package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk2
-rw-r--r--package/x11r7/xapp_xditview/xapp_xditview.mk2
-rw-r--r--package/x11r7/xapp_xdm/xapp_xdm.mk2
-rw-r--r--package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk2
-rw-r--r--package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk2
-rw-r--r--package/x11r7/xapp_xedit/xapp_xedit.mk2
-rw-r--r--package/x11r7/xapp_xev/xapp_xev.mk2
-rw-r--r--package/x11r7/xapp_xeyes/xapp_xeyes.mk2
-rw-r--r--package/x11r7/xapp_xf86dga/xapp_xf86dga.mk2
-rw-r--r--package/x11r7/xapp_xfd/xapp_xfd.mk2
-rw-r--r--package/x11r7/xapp_xfontsel/xapp_xfontsel.mk2
-rw-r--r--package/x11r7/xapp_xfs/xapp_xfs.mk2
-rw-r--r--package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk2
-rw-r--r--package/x11r7/xapp_xgamma/xapp_xgamma.mk2
-rw-r--r--package/x11r7/xapp_xgc/xapp_xgc.mk2
-rw-r--r--package/x11r7/xapp_xhost/xapp_xhost.mk2
-rw-r--r--package/x11r7/xapp_xinit/xapp_xinit.mk2
-rw-r--r--package/x11r7/xapp_xinput/xapp_xinput.mk2
-rw-r--r--package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk4
-rw-r--r--package/x11r7/xapp_xkbevd/xapp_xkbevd.mk2
-rw-r--r--package/x11r7/xapp_xkbprint/xapp_xkbprint.mk2
-rw-r--r--package/x11r7/xapp_xkbutils/xapp_xkbutils.mk2
-rw-r--r--package/x11r7/xapp_xkill/xapp_xkill.mk2
-rw-r--r--package/x11r7/xapp_xload/xapp_xload.mk2
-rw-r--r--package/x11r7/xapp_xlogo/xapp_xlogo.mk2
-rw-r--r--package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk2
-rw-r--r--package/x11r7/xapp_xlsclients/xapp_xlsclients.mk2
-rw-r--r--package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk2
-rw-r--r--package/x11r7/xapp_xmag/xapp_xmag.mk2
-rw-r--r--package/x11r7/xapp_xman/xapp_xman.mk2
-rw-r--r--package/x11r7/xapp_xmessage/xapp_xmessage.mk2
-rw-r--r--package/x11r7/xapp_xmh/xapp_xmh.mk2
-rw-r--r--package/x11r7/xapp_xmodmap/xapp_xmodmap.mk2
-rw-r--r--package/x11r7/xapp_xmore/xapp_xmore.mk2
-rw-r--r--package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk2
-rw-r--r--package/x11r7/xapp_xpr/xapp_xpr.mk2
-rw-r--r--package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk2
-rw-r--r--package/x11r7/xapp_xprop/xapp_xprop.mk2
-rw-r--r--package/x11r7/xapp_xrandr/xapp_xrandr.mk2
-rw-r--r--package/x11r7/xapp_xrdb/xapp_xrdb.mk2
-rw-r--r--package/x11r7/xapp_xrefresh/xapp_xrefresh.mk2
-rw-r--r--package/x11r7/xapp_xset/xapp_xset.mk2
-rw-r--r--package/x11r7/xapp_xsetmode/xapp_xsetmode.mk2
-rw-r--r--package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk2
-rw-r--r--package/x11r7/xapp_xsetroot/xapp_xsetroot.mk2
-rw-r--r--package/x11r7/xapp_xsm/xapp_xsm.mk2
-rw-r--r--package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk2
-rw-r--r--package/x11r7/xapp_xvidtune/xapp_xvidtune.mk2
-rw-r--r--package/x11r7/xapp_xvinfo/xapp_xvinfo.mk2
-rw-r--r--package/x11r7/xapp_xwd/xapp_xwd.mk2
-rw-r--r--package/x11r7/xapp_xwininfo/xapp_xwininfo.mk2
-rw-r--r--package/x11r7/xapp_xwud/xapp_xwud.mk2
-rw-r--r--package/x11r7/xcb-proto/xcb-proto.mk4
-rw-r--r--package/x11r7/xcb-util/xcb-util.mk2
-rw-r--r--package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk2
-rw-r--r--package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk2
-rw-r--r--package/x11r7/xfont_encodings/xfont_encodings.mk4
-rw-r--r--package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk2
-rw-r--r--package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk2
-rw-r--r--package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk2
-rw-r--r--package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk2
-rw-r--r--package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk2
-rw-r--r--package/x11r7/xfont_font-alias/xfont_font-alias.mk2
-rw-r--r--package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk2
-rw-r--r--package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk2
-rw-r--r--package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk2
-rw-r--r--package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk2
-rw-r--r--package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk2
-rw-r--r--package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk2
-rw-r--r--package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk2
-rw-r--r--package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk2
-rw-r--r--package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk2
-rw-r--r--package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk2
-rw-r--r--package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk2
-rw-r--r--package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk2
-rw-r--r--package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk2
-rw-r--r--package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk2
-rw-r--r--package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk2
-rw-r--r--package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk2
-rw-r--r--package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk2
-rw-r--r--package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk2
-rw-r--r--package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk2
-rw-r--r--package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk2
-rw-r--r--package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk2
-rw-r--r--package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk2
-rw-r--r--package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk3
-rw-r--r--package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk2
-rw-r--r--package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk2
-rw-r--r--package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk2
-rw-r--r--package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk2
-rw-r--r--package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk2
-rw-r--r--package/x11r7/xfont_font-util/xfont_font-util.mk4
-rw-r--r--package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk2
-rw-r--r--package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk2
-rw-r--r--package/x11r7/xkeyboard-config/xkeyboard-config.mk2
-rw-r--r--package/x11r7/xlib_libFS/xlib_libFS.mk2
-rw-r--r--package/x11r7/xlib_libICE/xlib_libICE.mk2
-rw-r--r--package/x11r7/xlib_libSM/xlib_libSM.mk2
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk4
-rw-r--r--package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk2
-rw-r--r--package/x11r7/xlib_libXau/xlib_libXau.mk4
-rw-r--r--package/x11r7/xlib_libXaw/xlib_libXaw.mk2
-rw-r--r--package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk2
-rw-r--r--package/x11r7/xlib_libXcursor/xlib_libXcursor.mk2
-rw-r--r--package/x11r7/xlib_libXdamage/xlib_libXdamage.mk2
-rw-r--r--package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk4
-rw-r--r--package/x11r7/xlib_libXext/xlib_libXext.mk2
-rw-r--r--package/x11r7/xlib_libXfixes/xlib_libXfixes.mk2
-rw-r--r--package/x11r7/xlib_libXfont/xlib_libXfont.mk4
-rw-r--r--package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk2
-rw-r--r--package/x11r7/xlib_libXft/xlib_libXft.mk2
-rw-r--r--package/x11r7/xlib_libXi/xlib_libXi.mk2
-rw-r--r--package/x11r7/xlib_libXinerama/xlib_libXinerama.mk2
-rw-r--r--package/x11r7/xlib_libXmu/xlib_libXmu.mk2
-rw-r--r--package/x11r7/xlib_libXp/xlib_libXp.mk2
-rw-r--r--package/x11r7/xlib_libXpm/xlib_libXpm.mk2
-rw-r--r--package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk2
-rw-r--r--package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk2
-rw-r--r--package/x11r7/xlib_libXrandr/xlib_libXrandr.mk2
-rw-r--r--package/x11r7/xlib_libXrender/xlib_libXrender.mk2
-rw-r--r--package/x11r7/xlib_libXres/xlib_libXres.mk2
-rw-r--r--package/x11r7/xlib_libXt/xlib_libXt.mk2
-rw-r--r--package/x11r7/xlib_libXtst/xlib_libXtst.mk2
-rw-r--r--package/x11r7/xlib_libXv/xlib_libXv.mk2
-rw-r--r--package/x11r7/xlib_libXvMC/xlib_libXvMC.mk2
-rw-r--r--package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk2
-rw-r--r--package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk2
-rw-r--r--package/x11r7/xlib_libdmx/xlib_libdmx.mk2
-rw-r--r--package/x11r7/xlib_libfontenc/xlib_libfontenc.mk4
-rw-r--r--package/x11r7/xlib_liboldX/xlib_liboldX.mk2
-rw-r--r--package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk2
-rw-r--r--package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk4
-rw-r--r--package/x11r7/xlib_libxkbui/xlib_libxkbui.mk2
-rw-r--r--package/x11r7/xlib_xtrans/xlib_xtrans.mk4
-rw-r--r--package/x11r7/xproto_applewmproto/xproto_applewmproto.mk2
-rw-r--r--package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk2
-rw-r--r--package/x11r7/xproto_compositeproto/xproto_compositeproto.mk2
-rw-r--r--package/x11r7/xproto_damageproto/xproto_damageproto.mk2
-rw-r--r--package/x11r7/xproto_dmxproto/xproto_dmxproto.mk2
-rw-r--r--package/x11r7/xproto_dri2proto/xproto_dri2proto.mk2
-rw-r--r--package/x11r7/xproto_fixesproto/xproto_fixesproto.mk2
-rw-r--r--package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk4
-rw-r--r--package/x11r7/xproto_fontsproto/xproto_fontsproto.mk4
-rw-r--r--package/x11r7/xproto_glproto/xproto_glproto.mk2
-rw-r--r--package/x11r7/xproto_inputproto/xproto_inputproto.mk4
-rw-r--r--package/x11r7/xproto_kbproto/xproto_kbproto.mk4
-rw-r--r--package/x11r7/xproto_printproto/xproto_printproto.mk2
-rw-r--r--package/x11r7/xproto_randrproto/xproto_randrproto.mk2
-rw-r--r--package/x11r7/xproto_recordproto/xproto_recordproto.mk2
-rw-r--r--package/x11r7/xproto_renderproto/xproto_renderproto.mk2
-rw-r--r--package/x11r7/xproto_resourceproto/xproto_resourceproto.mk2
-rw-r--r--package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk2
-rw-r--r--package/x11r7/xproto_videoproto/xproto_videoproto.mk2
-rw-r--r--package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk2
-rw-r--r--package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk4
-rw-r--r--package/x11r7/xproto_xextproto/xproto_xextproto.mk4
-rw-r--r--package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk4
-rw-r--r--package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk2
-rw-r--r--package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk2
-rw-r--r--package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk2
-rw-r--r--package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk2
-rw-r--r--package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk2
-rw-r--r--package/x11r7/xproto_xproto/xproto_xproto.mk4
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk2
-rw-r--r--package/x11r7/xutil_makedepend/xutil_makedepend.mk4
-rw-r--r--package/x11r7/xutil_util-macros/xutil_util-macros.mk4
256 files changed, 282 insertions, 283 deletions
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index a3c87d101..249217ccf 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -21,6 +21,6 @@ HOST_LIBXCB_DEPENDENCIES = \
host-libxslt host-pthread-stubs host-xcb-proto host-xlib_libXdmcp \
host-xlib_libXau host-python
-$(eval $(call AUTOTARGETS,package/x11r7,libxcb))
-$(eval $(call AUTOTARGETS,package/x11r7,libxcb,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index cb0690dc0..1fc1631de 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -13,4 +13,4 @@ MESA3D_INSTALL_STAGING = YES
MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat
-$(eval $(call AUTOTARGETS,package/x11r7,mesa3d))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index 75980c85d..25b443331 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -9,6 +9,6 @@ PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
PTHREAD_STUBS_INSTALL_STAGING = YES
-$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
-$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index 308634c5a..faa993795 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -10,4 +10,4 @@ XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_APPRES_AUTORECONF = NO
XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_appres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 0350a8741..c2f589632 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -11,5 +11,5 @@ XAPP_BDFTOPCF_AUTORECONF = NO
XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
HOST_XAPP_BDFTOPCF_DEPENDENCIES = host-xlib_libXfont
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index 8c1273f1f..8d4cb75e3 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -10,4 +10,4 @@ XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_BEFORELIGHT_AUTORECONF = NO
XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_beforelight))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 252507e57..4cca62380 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -10,4 +10,4 @@ XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_BITMAP_AUTORECONF = NO
XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_bitmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index 54f1b017f..a2ab2aa50 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -10,4 +10,4 @@ XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_EDITRES_AUTORECONF = NO
XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_editres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index 00b64f108..6c8ebccf7 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -10,4 +10,4 @@ XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_FONTTOSFNT_AUTORECONF = NO
XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_fonttosfnt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index 469fb4c29..737a4308b 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -10,4 +10,4 @@ XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_FSLSFONTS_AUTORECONF = NO
XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_fslsfonts))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index 052b572fd..e555179a2 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -10,4 +10,4 @@ XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_FSTOBDF_AUTORECONF = NO
XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_fstobdf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 3b9e373e7..19c429730 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -10,4 +10,4 @@ XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_ICEAUTH_AUTORECONF = NO
XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_iceauth))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 9edeacb16..41031f5ba 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -10,4 +10,4 @@ XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_ICO_AUTORECONF = NO
XAPP_ICO_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_ico))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index f856d7c0c..b86d181df 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -10,4 +10,4 @@ XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LISTRES_AUTORECONF = NO
XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_listres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index dc53e050a..ec7d89487 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -10,4 +10,4 @@ XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LUIT_AUTORECONF = NO
XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_luit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 443b44f34..ece5dd332 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -11,5 +11,5 @@ XAPP_MKFONTDIR_AUTORECONF = NO
XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index beec9f1c8..1c460d65a 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -11,5 +11,5 @@ XAPP_MKFONTSCALE_AUTORECONF = NO
XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index d3f09c0fe..00bb64451 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -10,4 +10,4 @@ XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_OCLOCK_AUTORECONF = NO
XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_oclock))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 95ee70bbf..e8c89fe16 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -10,4 +10,4 @@ XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_RGB_AUTORECONF = NO
XAPP_RGB_DEPENDENCIES = xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_rgb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index aa37f29a5..e5fb08408 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -10,4 +10,4 @@ XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_RSTART_AUTORECONF = NO
XAPP_RSTART_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_rstart))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index 00fb6956a..a2a050cf2 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -10,4 +10,4 @@ XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SCRIPTS_AUTORECONF = NO
XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_scripts))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 699537d70..b207f2c47 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -10,4 +10,4 @@ XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SESSREG_AUTORECONF = NO
XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_sessreg))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index 7c9d0f823..e5be0779f 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -10,4 +10,4 @@ XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SETXKBMAP_AUTORECONF = NO
XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_setxkbmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index 21273e401..a5ff670c7 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -10,4 +10,4 @@ XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SHOWFONT_AUTORECONF = NO
XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_showfont))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index fa2acb3b5..d1e79aee7 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -10,4 +10,4 @@ XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SMPROXY_AUTORECONF = NO
XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_smproxy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index bc35293e4..7e633539a 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -10,4 +10,4 @@ XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_TWM_AUTORECONF = NO
XAPP_TWM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_twm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index a2cd1ea69..7396d9321 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -10,4 +10,4 @@ XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_VIEWRES_AUTORECONF = NO
XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_viewres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index ac8cd7a61..b08dfc9ce 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -10,4 +10,4 @@ XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_X11PERF_AUTORECONF = NO
XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_x11perf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index c0ab92d08..a2212666a 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -10,4 +10,4 @@ XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XAUTH_AUTORECONF = NO
XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xauth))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
index 9da0c65a6..f5afa5ca7 100644
--- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
+++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.mk
@@ -10,4 +10,4 @@ XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XBACKLIGHT_AUTORECONF = NO
XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbacklight))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index 695939825..38627940e 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -10,4 +10,4 @@ XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XBIFF_AUTORECONF = NO
XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbiff))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index e3ef39c56..a6f0fc1e1 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -11,4 +11,4 @@ XAPP_XCALC_AUTORECONF = NO
XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
XAPP_XCALC_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcalc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 9cfeddd25..a7ff73903 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -10,4 +10,4 @@ XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCLIPBOARD_AUTORECONF = NO
XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xclipboard))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 56b22fca6..96fad9109 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -10,4 +10,4 @@ XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCLOCK_AUTORECONF = NO
XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xclock))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 06af50de7..11b17f59d 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -10,4 +10,4 @@ XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCMSDB_AUTORECONF = NO
XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcmsdb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 746564ffd..55ddcdc0b 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -10,4 +10,4 @@ XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCURSORGEN_AUTORECONF = NO
XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcursorgen))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 9f8135798..aa57f7cc5 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -10,4 +10,4 @@ XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDBEDIZZY_AUTORECONF = NO
XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdbedizzy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 9d69d81bd..5241e43ff 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -10,4 +10,4 @@ XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDITVIEW_AUTORECONF = NO
XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xditview))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index e05ffc8ad..8d17d5ca6 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -11,4 +11,4 @@ XAPP_XDM_AUTORECONF = NO
XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 36cc0679b..663c1e175 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -10,4 +10,4 @@ XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDPYINFO_AUTORECONF = NO
XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86vidmodeproto xlib_libdmx
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdpyinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index ce4716dca..3be1fb156 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -10,4 +10,4 @@ XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDRIINFO_AUTORECONF = NO
XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdriinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index 888d54ec4..72f2f7b42 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -10,4 +10,4 @@ XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEDIT_AUTORECONF = NO
XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xedit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 19be2c166..3662c2356 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -10,4 +10,4 @@ XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEV_AUTORECONF = NO
XAPP_XEV_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 74358d543..270ad6c32 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -10,4 +10,4 @@ XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEYES_AUTORECONF = NO
XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xeyes))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index da141ae4f..fb78f1ac8 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -10,4 +10,4 @@ XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XF86DGA_AUTORECONF = NO
XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xf86dga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 622dafd9a..f132c6004 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -10,4 +10,4 @@ XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFD_AUTORECONF = NO
XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index 2b271605d..b1c39b8b2 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -10,4 +10,4 @@ XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFONTSEL_AUTORECONF = NO
XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfontsel))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index 2398d6b1c..b01c75686 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -10,4 +10,4 @@ XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFS_AUTORECONF = NO
XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfs))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index 1ea730641..c0fb6008d 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -10,4 +10,4 @@ XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFSINFO_AUTORECONF = NO
XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfsinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 2bdaa2737..250530611 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -10,4 +10,4 @@ XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XGAMMA_AUTORECONF = NO
XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xgamma))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index 9e642e2d1..f9de6418b 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -10,4 +10,4 @@ XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XGC_AUTORECONF = NO
XAPP_XGC_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xgc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index fd8153750..f5cdc5cdc 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -10,4 +10,4 @@ XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XHOST_AUTORECONF = NO
XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xhost))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index 52105c2e6..48637f226 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -9,4 +9,4 @@ XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinit))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 423c7c2f0..38c45cbff 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -10,4 +10,4 @@ XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XINPUT_AUTORECONF = NO
XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index e9f7174a8..04a558e03 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -11,5 +11,5 @@ XAPP_XKBCOMP_AUTORECONF = NO
XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp))
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 48d65656f..efd3c374a 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -10,4 +10,4 @@ XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBEVD_AUTORECONF = NO
XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbevd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index ec96c9448..214ccc10c 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -10,4 +10,4 @@ XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBPRINT_AUTORECONF = NO
XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbprint))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 07a34f468..7daca60be 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -10,4 +10,4 @@ XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBUTILS_AUTORECONF = NO
XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbutils))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index 894c552a8..d9364c5c3 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -10,4 +10,4 @@ XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKILL_AUTORECONF = NO
XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkill))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index e1ae662d6..913009606 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -10,4 +10,4 @@ XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLOAD_AUTORECONF = NO
XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xload))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index eb35a6dc8..205703106 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -11,4 +11,4 @@ XAPP_XLOGO_AUTORECONF = NO
XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender \
xlib_libXft host-pkg-config
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlogo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index d20211462..379994d5f 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -10,4 +10,4 @@ XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSATOMS_AUTORECONF = NO
XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsatoms))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index cd522db83..2374215a4 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -10,4 +10,4 @@ XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSCLIENTS_AUTORECONF = NO
XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsclients))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 120669c11..944c6fcea 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -10,4 +10,4 @@ XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSFONTS_AUTORECONF = NO
XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsfonts))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index 518fe484d..f84860194 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -10,4 +10,4 @@ XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMAG_AUTORECONF = NO
XAPP_XMAG_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmag))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 8ef0a1fd2..703d8dcd3 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -15,4 +15,4 @@ XAPP_XMAN_CONF_ENV = ac_cv_file__etc_man_conf=no \
XAPP_XMAN_CONF_OPT = --disable-IPv6
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xman))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 9f1aa743e..4a0ecc819 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -10,4 +10,4 @@ XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMESSAGE_AUTORECONF = NO
XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmessage))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 500801b10..ed8276a6b 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -10,4 +10,4 @@ XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMH_AUTORECONF = NO
XAPP_XMH_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmh))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index df4280b12..d498d98ba 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -10,4 +10,4 @@ XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMODMAP_AUTORECONF = NO
XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmodmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index 0b68e7196..ecbdbafce 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -10,4 +10,4 @@ XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMORE_AUTORECONF = NO
XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmore))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
index e16733bf0..b39e4b5f7 100644
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -10,4 +10,4 @@ XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPLSPRINTERS_AUTORECONF = NO
XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xplsprinters))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 257d10b14..871d711e3 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -10,4 +10,4 @@ XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPR_AUTORECONF = NO
XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xpr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
index e9f8f4300..00c429cfc 100644
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -10,4 +10,4 @@ XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/
XAPP_XPREHASHPRINTERLIST_AUTORECONF = NO
XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xprehashprinterlist))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 7bcd1f00b..5b315064a 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -10,4 +10,4 @@ XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPROP_AUTORECONF = NO
XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xprop))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 70c7e1a2d..254feadcb 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -11,4 +11,4 @@ XAPP_XRANDR_AUTORECONF = NO
XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrandr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index c7b24b5f7..425cef43a 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -10,4 +10,4 @@ XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRDB_AUTORECONF = NO
XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrdb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index 9a9022c42..d6d04d68c 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -10,4 +10,4 @@ XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XREFRESH_AUTORECONF = NO
XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrefresh))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 51ddd98c1..fcd8df06d 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -10,4 +10,4 @@ XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSET_AUTORECONF = NO
XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xset))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 23db1f93e..650afb041 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -10,4 +10,4 @@ XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETMODE_AUTORECONF = NO
XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetmode))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 7c65bc716..5f9ef251b 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -10,4 +10,4 @@ XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETPOINTER_AUTORECONF = NO
XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetpointer))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 523c89a84..0f797a33e 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -10,4 +10,4 @@ XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETROOT_AUTORECONF = NO
XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetroot))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index 76cc07b11..30175524b 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -10,4 +10,4 @@ XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSM_AUTORECONF = NO
XAPP_XSM_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index 613797493..b0b996065 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -10,4 +10,4 @@ XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSTDCMAP_AUTORECONF = NO
XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xstdcmap))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 039da1883..e89dc5d95 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -10,4 +10,4 @@ XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XVIDTUNE_AUTORECONF = NO
XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xvidtune))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index 59d8ad3f4..9541c2d07 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -10,4 +10,4 @@ XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XVINFO_AUTORECONF = NO
XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xvinfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index bdd6182d6..3a966276d 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -10,4 +10,4 @@ XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWD_AUTORECONF = NO
XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwd))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index 36f11f779..7c7012cd7 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -10,4 +10,4 @@ XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWININFO_AUTORECONF = NO
XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwininfo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index 0640f78ee..97ecf0f2c 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -10,4 +10,4 @@ XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWUD_AUTORECONF = NO
XAPP_XWUD_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwud))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 47a38cb67..3479a23b4 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -11,6 +11,6 @@ XCB_PROTO_INSTALL_STAGING = YES
XCB_PROTO_DEPENDENCIES = host-python
-$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto))
-$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index 2983280dc..0158c9f09 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -8,5 +8,5 @@ XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
XCB_UTIL_DEPENDENCIES = host-gperf
-$(eval $(call AUTOTARGETS,package/x11r7,xcb-util))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index c1bb3010a..e40093406 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -11,4 +11,4 @@ XDATA_XBITMAPS_AUTORECONF = NO
XDATA_XBITMAPS_INSTALL_STAGING = YES
XDATA_XBITMAPS_INSTALL_TARGET = YES
-$(eval $(call AUTOTARGETS,package/x11r7,xdata_xbitmaps))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index da928f4fd..fe5c0dadc 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -11,4 +11,4 @@ XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES
XDATA_XCURSOR_THEMES_INSTALL_TARGET = YES
XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor
-$(eval $(call AUTOTARGETS,package/x11r7,xdata_xcursor-themes))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
index d6f958cbd..2b9acfb54 100644
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = NO
XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-acecad))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index aa93fdc49..6b92700e8 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = NO
XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-aiptek))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index bb5a1d728..019587654 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = NO
XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-evdev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index f6d561957..dbd1bdead 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = NO
XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-joystick))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index 15b07155a..b28843dfa 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = NO
XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-keyboard))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 6be28c7d1..5be5cb969 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = NO
XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-mouse))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 4cb16ea0f..129f2120b 100644
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individ
XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = NO
XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-synaptics))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 352623660..20328b217 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = NO
XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-vmmouse))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index fb16bb7fe..c92af152f 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_INPUT_VOID_AUTORECONF = NO
XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-void))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index c0f4b82e4..162e9b365 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_APM_AUTORECONF = NO
XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-apm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 744270644..2976ae4a1 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_ARK_AUTORECONF = NO
XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ark))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index daa94bbd8..c77c7acce 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION)
XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_AST_AUTORECONF = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ast))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 8a5a1d0b3..a357cf21c 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index 0dc5dd108..532fda138 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = NO
XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-chips))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 47c3c9ba8..64548d303 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = NO
XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-cirrus))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 212174858..4a4ce7a33 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = NO
XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-dummy))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 97c20fa53..6964a358e 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = NO
XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-fbdev))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index cd94246f5..8284d048e 100644
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_GEODE_AUTORECONF = NO
XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-geode))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
index 0115cec95..122837bf1 100644
--- a/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ b/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_GLIDE_AUTORECONF = NO
XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glide))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 5d50da1f3..2ff766952 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 63c9ad7e1..96628cf85 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_I128_AUTORECONF = NO
XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i128))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
index 493fd348e..2b137d72a 100644
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_I740_AUTORECONF = NO
XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i740))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 83d0a4419..a24a24170 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -11,4 +11,4 @@ XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = --enable-dri
XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 5b727691b..063608545 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mach64))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 033a32c9f..64bae465a 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index db9c2c0cd..759d5b252 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = NO
XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-neomagic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index b9bf3e791..f532f2e9b 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_NEWPORT_AUTORECONF = NO
XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-newport))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index 9f969e591..50080f982 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/dri
XDRIVER_XF86_VIDEO_NV_AUTORECONF = NO
XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-nv))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 19d67cc6a..c16655932 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -24,4 +24,4 @@ XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-openchrome))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index 0e74607a1..8430d73a3 100644
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-r128))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index dc03a877f..9684f4119 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individ
XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = NO
XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-rendition))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
index d6f732718..f9c6f08fc 100644
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/dri
XDRIVER_XF86_VIDEO_S3_AUTORECONF = NO
XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-s3))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
index 9c7b2c26e..08c527d50 100644
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = NO
XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-s3virge))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 44707366a..32ef7f58b 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-savage))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 97e416a59..8b52933f8 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/ind
XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-siliconmotion))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 0fb335c91..834376145 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index 3cd6012be..aaf86f232 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sisusb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
index 6a0fb0494..7e9e1c740 100644
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_SUNCG14_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg14))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
index 7ba7ecd92..939d4dee6 100644
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNCG3_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg3))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
index 7234e9832..f5e1a7b30 100644
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNCG6_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg6))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
index 7c6019b6d..0e365d838 100644
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunffb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
index 38af6d0f3..81dc5f5ab 100644
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunleo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
index b26d659b7..4c1f35a64 100644
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNTCX_AUTORECONF = NO
XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suntcx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index c11e40806..dd2643a9f 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tdfx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index 68e58fbe4..c6c55d607 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_TGA_AUTORECONF = NO
XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index da3edbbec..4a722b8c4 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = NO
XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-trident))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index 6ad802378..21cb2dbc1 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = NO
XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tseng))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index dffcf13e0..2e265b7a3 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_V4L_AUTORECONF = NO
XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-v4l))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index 5d0ed12ad..bc4c38edc 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vesa))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index a92bc3b48..255bde1bd 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = NO
XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vmware))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index dadd3f4b9..8fc7fa4be 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = NO
XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-voodoo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
index e71715a7e..da7a5c6c9 100644
--- a/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ b/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_WSFB_AUTORECONF = NO
XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-wsfb))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
index 49fb8b0af..837c9dd2d 100644
--- a/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
+++ b/package/x11r7/xdriver_xf86-video-xgi/xdriver_xf86-video-xgi.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_XGI_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_XGI_AUTORECONF = YES
XDRIVER_XF86_VIDEO_XGI_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-xgi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
index c55390ac2..a3edd207d 100644
--- a/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
+++ b/package/x11r7/xdriver_xf86-video-xgixp/xdriver_xf86-video-xgixp.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_XGIXP_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_XGIXP_AUTORECONF = YES
XDRIVER_XF86_VIDEO_XGIXP_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-xgixp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index ed94e49bd..3bf7bc071 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -12,5 +12,5 @@ XFONT_ENCODINGS_MAKE_OPT =
XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
HOST_XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings))
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 2b9c50c24..9a7503c47 100644
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE
XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-100dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index 2d7791a51..82ae78b36 100644
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-75dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index 2ed27f495..fad8dcde3 100644
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFO
XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-100dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index ead419635..e6bd35f47 100644
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFON
XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-75dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 983bab6db..bb553ee8e 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFON
XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-type1))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index 1e85f3ed6..29cb3698a 100644
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST
XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-alias))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index 5a1253a6f..5d20d571b 100644
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-arabic-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index f2f796a3a..8003d2bc6 100644
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-100dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index 4d08be40b..42369230b 100644
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-75dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index a7897c261..dafc4eb6c 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DI
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-lucidatypewriter-100dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 04a324624..6812fc7a4 100644
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-lucidatypewriter-75dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index ea2c82a26..13c8c4d2b 100644
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOS
XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-ttf))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index 3f5a025d0..b4b612fb9 100644
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bh-type1))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index a89db53e3..2fb3b3cb8 100644
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTS
XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-100dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index ea2fd41eb..b815f7c79 100644
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-75dpi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
index f867c7ebb..19d410783 100644
--- a/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
+++ b/package/x11r7/xfont_font-bitstream-speedo/xfont_font-bitstream-speedo.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTS
XFONT_FONT_BITSTREAM_SPEEDO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_SPEEDO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-speedo))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 75a60de15..df1bc9735 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-type1))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 484bf4b8f..919738a42 100644
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-cronyx-cyrillic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 755f6ec70..05a526204 100644
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-cursor-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index c66bbbbc3..d6514f315 100644
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-daewoo-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index 9c510a1d5..00dc6767b 100644
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-dec-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 075f4bacc..f03eb4f64 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-ibm-type1))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 5635ff6f2..db66a7456 100644
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-isas-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 4f1a74ed3..3f00e32e4 100644
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-jis-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 0b1f35cd9..73672871b 100644
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$
XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-micro-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index 3ae408d02..a537b37b0 100644
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-cyrillic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index e0937813f..f7ffcf6bb 100644
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-ethiopic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index e04f01d9d..3f5d5365c 100644
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=
XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-meltho))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index f6a556493..8e28f9c9e 100644
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -12,5 +12,4 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-misc))
-
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 28995ef7b..494c1cc50 100644
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-mutt-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 86dc54be4..37f0b70e2 100644
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-schumacher-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index d0db502f2..ecb2d805f 100644
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSC
XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-screen-cyrillic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 7fc9cbfba..75d5baa8a 100644
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-sony-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 9364e4a38..8419842b9 100644
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -12,5 +12,5 @@ XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(H
XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-sun-misc))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 82b66a5d0..680fdc7cb 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -13,5 +13,5 @@ XFONT_FONT_UTIL_INSTALL_TARGET = NO
HOST_XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 377f281df..66eac4e33 100644
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -12,5 +12,5 @@ XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONT
XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-winitzki-cyrillic))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index 6e3e56469..7d3d8cace 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -12,5 +12,5 @@ XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCAL
XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
-$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-xfree86-type1))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index f5ad44d7f..955c5233f 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -13,5 +13,5 @@ XKEYBOARD_CONFIG_DEPENDENCIES = host-intltool host-xapp_xkbcomp
XKEYBOARD_CONFIG_CONF_OPT = GMSGFMT=/usr/bin/msgfmt
-$(eval $(call AUTOTARGETS,package/x11r7,xkeyboard-config))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index f121f246e..75281027d 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -12,4 +12,4 @@ XLIB_LIBFS_INSTALL_STAGING = YES
XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libFS))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 168f899f2..338d74bec 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -11,4 +11,4 @@ XLIB_LIBICE_AUTORECONF = NO
XLIB_LIBICE_INSTALL_STAGING = YES
XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libICE))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index e22c04b5a..0b92f9368 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -12,4 +12,4 @@ XLIB_LIBSM_INSTALL_STAGING = YES
XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
XLIB_LIBSM_CONF_OPT = --without-libuuid
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libSM))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 95b148350..e017feabc 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -39,5 +39,5 @@ endef
XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 4b60fdc50..479cd35aa 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -12,4 +12,4 @@ XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXScrnSaver))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 2b008e9c2..2404a3e40 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -13,5 +13,5 @@ XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto
HOST_XLIB_LIBXAU_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index d06ff6ed9..1142c7617 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -11,4 +11,4 @@ XLIB_LIBXAW_INSTALL_STAGING = YES
XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
XLIB_LIBXAW_CONF_OPT = --disable-docs
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXaw))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index e1a1852a5..9a5a33ab2 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -11,4 +11,4 @@ XLIB_LIBXCOMPOSITE_AUTORECONF = NO
XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcomposite))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index a6bbcc875..ffe1b4d59 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -11,4 +11,4 @@ XLIB_LIBXCURSOR_AUTORECONF = NO
XLIB_LIBXCURSOR_INSTALL_STAGING = YES
XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcursor))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 324035593..c2ba616ce 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -11,4 +11,4 @@ XLIB_LIBXDAMAGE_AUTORECONF = NO
XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdamage))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 8d03fc8ae..1aec4de64 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -13,5 +13,5 @@ XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 6b60042e2..c97a9a5ca 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -12,4 +12,4 @@ XLIB_LIBXEXT_INSTALL_STAGING = YES
XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXext))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 2d07d6957..2450bcec8 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFIXES_AUTORECONF = NO
XLIB_LIBXFIXES_INSTALL_STAGING = YES
XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfixes))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index b30a88c06..303992fcc 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -15,5 +15,5 @@ XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
HOST_XLIB_LIBXFONT_DEPENDENCIES = host-freetype host-xlib_libfontenc host-xlib_xtrans host-xproto_fontcacheproto host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index bf64a4dbd..d90a96241 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -12,4 +12,4 @@ XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfontcache))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 942b9a62a..44ddcbe6d 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -11,4 +11,4 @@ XLIB_LIBXFT_AUTORECONF = YES
XLIB_LIBXFT_INSTALL_STAGING = YES
XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXft))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index 3cca1e6b3..d6ce633e9 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -12,4 +12,4 @@ XLIB_LIBXI_INSTALL_STAGING = YES
XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXi))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index fe7c5ede7..0b8262232 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -12,4 +12,4 @@ XLIB_LIBXINERAMA_INSTALL_STAGING = YES
XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXinerama))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index c1c9503e6..ceebc149e 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -11,4 +11,4 @@ XLIB_LIBXMU_AUTORECONF = NO
XLIB_LIBXMU_INSTALL_STAGING = YES
XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXmu))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index f030082e2..bc8bfcd4f 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -12,4 +12,4 @@ XLIB_LIBXP_INSTALL_STAGING = YES
XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXp))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 459a29938..ef67b6dde 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -11,4 +11,4 @@ XLIB_LIBXPM_AUTORECONF = NO
XLIB_LIBXPM_INSTALL_STAGING = YES
XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXpm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index f98059497..c9b2924fd 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -11,4 +11,4 @@ XLIB_LIBXPRINTAPPUTIL_AUTORECONF = NO
XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintAppUtil))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index ed801ff38..cf6ec1efd 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -11,4 +11,4 @@ XLIB_LIBXPRINTUTIL_AUTORECONF = NO
XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintUtil))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 20b61d111..96e71ea06 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRANDR_INSTALL_STAGING = YES
XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrandr))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 1148a6cbd..36495034d 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrender))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 51451a08f..cf7fc10d8 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRES_INSTALL_STAGING = YES
XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXres))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 41bf26d6f..765f0d55c 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -12,4 +12,4 @@ XLIB_LIBXT_INSTALL_STAGING = YES
XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXt))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index dd1cfd01a..feab32a52 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -15,4 +15,4 @@ XLIB_LIBXTST_DEPENDENCIES = \
xlib_libXi \
xproto_recordproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXtst))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index c827938a1..fed9ce49a 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -12,4 +12,4 @@ XLIB_LIBXV_INSTALL_STAGING = YES
XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXv))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index e2a5aed3e..6a99b9b3d 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -12,4 +12,4 @@ XLIB_LIBXVMC_INSTALL_STAGING = YES
XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXvMC))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index 2a8ef9fbe..acfd08a95 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86dga))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index a73ba6b55..c80d5b307 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86VM_INSTALL_STAGING = YES
XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86vm))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 073005ca1..3de2537cf 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -12,4 +12,4 @@ XLIB_LIBDMX_INSTALL_STAGING = YES
XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libdmx))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index c2ce11f10..20cfc8dbb 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -13,5 +13,5 @@ XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 94a38fabe..0d576ef8f 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -12,4 +12,4 @@ XLIB_LIBOLDX_INSTALL_STAGING = YES
XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_liboldX))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
index 5929a62fd..6c7822512 100644
--- a/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
+++ b/package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk
@@ -9,4 +9,4 @@ XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2
XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBPCIACCESS_INSTALL_STAGING = YES
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 96420c3a3..35b61715a 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -13,5 +13,5 @@ XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index 8253ac59d..c822a4d2d 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -11,4 +11,4 @@ XLIB_LIBXKBUI_AUTORECONF = NO
XLIB_LIBXKBUI_INSTALL_STAGING = YES
XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbui))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index aaf220836..62fb51d5a 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -10,5 +10,5 @@ XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_XTRANS_AUTORECONF = NO
XLIB_XTRANS_INSTALL_STAGING = YES
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_xtrans))
-$(eval $(call AUTOTARGETS,package/x11r7,xlib_xtrans,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index 189c24f73..2d7b5d1f5 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -11,4 +11,4 @@ XPROTO_APPLEWMPROTO_AUTORECONF = NO
XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_applewmproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index 7ae7795b3..bb4af54fd 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -11,4 +11,4 @@ XPROTO_BIGREQSPROTO_AUTORECONF = NO
XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_bigreqsproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index b176b6984..e5a34c0cf 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -11,4 +11,4 @@ XPROTO_COMPOSITEPROTO_AUTORECONF = NO
XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_compositeproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index a2f8c715e..5eb25fd53 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -11,4 +11,4 @@ XPROTO_DAMAGEPROTO_AUTORECONF = NO
XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_damageproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index ff31e7e7e..0fcf00d19 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -11,4 +11,4 @@ XPROTO_DMXPROTO_AUTORECONF = NO
XPROTO_DMXPROTO_INSTALL_STAGING = YES
XPROTO_DMXPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_dmxproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
index f3b37c909..a441c9bc8 100644
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
@@ -11,4 +11,4 @@ XPROTO_DRI2PROTO_AUTORECONF = NO
XPROTO_DRI2PROTO_INSTALL_STAGING = YES
XPROTO_DRI2PROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_dri2proto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index 1395e0c98..d569de85b 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -11,4 +11,4 @@ XPROTO_FIXESPROTO_AUTORECONF = NO
XPROTO_FIXESPROTO_INSTALL_STAGING = YES
XPROTO_FIXESPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fixesproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 40917cd80..fec4e87a9 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -11,5 +11,5 @@ XPROTO_FONTCACHEPROTO_AUTORECONF = NO
XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontcacheproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontcacheproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index 5e2a64a60..d947009b4 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -11,5 +11,5 @@ XPROTO_FONTSPROTO_AUTORECONF = NO
XPROTO_FONTSPROTO_INSTALL_STAGING = YES
XPROTO_FONTSPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontsproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontsproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index 98c6b2fa0..7bdf057e4 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -11,4 +11,4 @@ XPROTO_GLPROTO_AUTORECONF = NO
XPROTO_GLPROTO_INSTALL_STAGING = YES
XPROTO_GLPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_glproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index 825ebed4c..d8fa54312 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -11,5 +11,5 @@ XPROTO_INPUTPROTO_AUTORECONF = NO
XPROTO_INPUTPROTO_INSTALL_STAGING = YES
XPROTO_INPUTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index ecdabf127..9b30fbb88 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -11,5 +11,5 @@ XPROTO_KBPROTO_AUTORECONF = NO
XPROTO_KBPROTO_INSTALL_STAGING = YES
XPROTO_KBPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
index c06c5c380..82ba8218f 100644
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -11,4 +11,4 @@ XPROTO_PRINTPROTO_AUTORECONF = NO
XPROTO_PRINTPROTO_INSTALL_STAGING = YES
XPROTO_PRINTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_printproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index e6befea45..cfbb21346 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -11,4 +11,4 @@ XPROTO_RANDRPROTO_AUTORECONF = NO
XPROTO_RANDRPROTO_INSTALL_STAGING = YES
XPROTO_RANDRPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_randrproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 83178bd5c..4c3560523 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -11,4 +11,4 @@ XPROTO_RECORDPROTO_AUTORECONF = NO
XPROTO_RECORDPROTO_INSTALL_STAGING = YES
XPROTO_RECORDPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_recordproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index 1763efdf6..796051741 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -11,4 +11,4 @@ XPROTO_RENDERPROTO_AUTORECONF = NO
XPROTO_RENDERPROTO_INSTALL_STAGING = YES
XPROTO_RENDERPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_renderproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index c5e0d4733..081297873 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -11,4 +11,4 @@ XPROTO_RESOURCEPROTO_AUTORECONF = NO
XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_resourceproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index f7f53e6d7..2705a3ae7 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -11,4 +11,4 @@ XPROTO_SCRNSAVERPROTO_AUTORECONF = NO
XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_scrnsaverproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 3b9837089..4dafe3b89 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -11,4 +11,4 @@ XPROTO_VIDEOPROTO_AUTORECONF = NO
XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_videoproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index 827d7975f..bf0b59b24 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -11,4 +11,4 @@ XPROTO_WINDOWSWMPROTO_AUTORECONF = NO
XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_windowswmproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index 1846f2004..59f259242 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -11,5 +11,5 @@ XPROTO_XCMISCPROTO_AUTORECONF = NO
XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index 1fd39c91d..0a61fb23e 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -11,5 +11,5 @@ XPROTO_XEXTPROTO_AUTORECONF = NO
XPROTO_XEXTPROTO_INSTALL_STAGING = YES
XPROTO_XEXTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index 1872873b5..d7524e625 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -11,5 +11,5 @@ XPROTO_XF86BIGFONTPROTO_AUTORECONF = NO
XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index d654a1c4b..41fcfed28 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86DGAPROTO_AUTORECONF = NO
XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86dgaproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 4c37fa12c..c8ec7fc00 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86DRIPROTO_AUTORECONF = NO
XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86driproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
index 032b839da..d4145ecec 100644
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86RUSHPROTO_AUTORECONF = NO
XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86rushproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index c3f3fe592..0910867df 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86VIDMODEPROTO_AUTORECONF = NO
XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86vidmodeproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index bca3c8fd6..a73ded9e4 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -11,4 +11,4 @@ XPROTO_XINERAMAPROTO_AUTORECONF = NO
XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xineramaproto))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index c1e24495f..65510e93e 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -11,5 +11,5 @@ XPROTO_XPROTO_AUTORECONF = NO
XPROTO_XPROTO_INSTALL_STAGING = YES
XPROTO_XPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto))
-$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 70ba8b20f..54f98b784 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -153,4 +153,4 @@ else
XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
endif
-$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
+$(eval $(call AUTOTARGETS))
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 660323de9..657a2fce1 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -13,5 +13,5 @@ XUTIL_MAKEDEPEND_INSTALL_TARGET = YES
HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto_xproto
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend))
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index b600a4694..8bb7f8f13 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -11,5 +11,5 @@ XUTIL_UTIL_MACROS_AUTORECONF = NO
XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros))
-$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros,host))
+$(eval $(call AUTOTARGETS))
+$(eval $(call AUTOTARGETS,host))