diff --git a/net/nut/Config.in b/net/nut/Config.in new file mode 100644 index 000000000..b37dbca01 --- /dev/null +++ b/net/nut/Config.in @@ -0,0 +1,107 @@ + config NUT_SERVER + depends on PACKAGE_nut + bool "Include server components (upsd)" + help + upsd is responsible for serving the data from the drivers to the + clients. It connects to each driver and maintains a local cache of the + current state. Queries from the clients are served from this cache, so + delays are minimal. This program is essential, and must be running at + all times to actually make any use out of the drivers and clients. + default y + + config NUT_CLIENTS_UPSC + depends on PACKAGE_nut + bool "Include command line client (upsc)" + help + upsc is provided as a quick way to poll the status of a UPS server. It + can be used inside shell scripts and other programs that need UPS data + but don't want to include the full interface. + default y + + config NUT_CLIENTS_UPSLOG + depends on PACKAGE_nut + bool "Include logging client (upslog)" + help + upslog is a daemon that will poll a UPS at periodic intervals, fetch the + variables that interest you, format them, and write them to a file. + default n + + config NUT_CLIENTS_UPSCMD + depends on PACKAGE_nut + bool "Include UPS controller (upscmd)" + help + upscmd allows you to invoke "instant commands" in your UPS hardware. Not + all hardware supports this, so check the list with -l to see if anything + will work on your equipment. On hardware that supports it, you can use + this program to start and stop battery tests, invoke a front panel test + (beep!), turn the load on or off, and more. + default n + + config NUT_CLIENTS_UPSRW + depends on PACKAGE_nut + bool "Include UPS variable editor (upsrw)" + help + upsrw allows you to view and change the read/write variables inside your + UPS. It sends commands via the upsd to your driver, which configures the + hardware for you. The list of variables that allow you to change their + values is based on the capabilities of your UPS equipment. Not all + models support this feature. Typically, cheaper hardware does not + support any of them. + default n + + config NUT_CLIENTS_UPSMON + depends on PACKAGE_nut + bool "Include monitor and shutdown controller (upsmon)" + help + upsmon is the client process that is responsible for the most important + part of UPS monitoring--shutting down the system when the power goes + out. It can call out to other helper programs for notification purposes + during power events. upsmon can monitor multiple systems using a single + process. Every UPS that is defined in the upsmon.conf configuration file + is assigned a power value and a type (slave or master). + default y + + config NUT_CLIENTS_UPSSCHED + depends on NUT_CLIENTS_UPSMON + bool "Include helper for triggering events from upsmon (upssched)" + help + upssched was created to allow users to execute programs at times relative + to events being monitored by upsmon. The original purpose was to allow + for a shutdown to occur after some fixed period on battery, but there are + other uses that are possible. + You can alternatively write your own script and save some space. + default n + + config NUT_SSL + depends on PACKAGE_nut + bool "Build with support for OpenSSL" + help + SSL allows sessions between upsd and clients to be encrypted and can + also be used to authenticate servers. This means that stealing port + 3493 from upsd will no longer net you interesting passwords. SSL is + available via OpenSSL on OpenWRT (NSS doesn't seem to work). If you + are happy with using passwords to authenticate clients, you can save + some space and build NUT without SSL support. + default n + + config NUT_DRIVER_SERIAL + depends on PACKAGE_nut + bool "Build with support for serial drivers" + help + If you have a UPS connected via serial, select this. + default n + + config NUT_DRIVER_USB + depends on PACKAGE_nut + bool "Build with support for USB drivers" + help + If you have a UPS connected via USB, select this. + default y + + config NUT_DRIVER_SNMP + depends on PACKAGE_nut + bool "Build with support for SNMP drivers" + help + If you have a UPS you can connect to via SNMP, select this. + default n + diff --git a/net/nut/Makefile b/net/nut/Makefile new file mode 100644 index 000000000..41e00b719 --- /dev/null +++ b/net/nut/Makefile @@ -0,0 +1,279 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nut +PKG_VERSION:=2.7.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/ +PKG_MD5SUM:=c3568b42e058cfc385b46d25140dced4 +PKG_MAINTAINER:=Martin Rowe +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=LICENSE-GPL2 + +PKG_BUILD_DIR:=$(BUILD_DIR)/nut-$(PKG_VERSION) +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/nut/Default + SECTION:=net + CATEGORY:=Network + URL:=http://www.networkupstools.org/ + DEPENDS:=nut +endef + +define Package/nut/description +Network UPS Tools (NUT) is a client/server monitoring system that +allows computers to share uninterruptible power supply (UPS) and +power distribution unit (PDU) hardware. Clients access the hardware +through the server, and are notified whenever the power status +changes. +endef + +define Package/nut + $(call Package/nut/Default) + TITLE:=Network UPS Tools + DEPENDS:= \ + +NUT_DRIVER_SNMP:libnetsnmp \ + +NUT_DRIVER_USB:libusb-compat \ + +NUT_SSL:libopenssl + MENU:=1 +endef + +define Package/nut/config + source "$(SOURCE)/Config.in" +endef + +define Package/nut/conffiles + /etc/nut/nut.conf + $(if $(CONFIG_NUT_CLIENTS_UPSMON),/etc/nut/upsmon.conf) + $(if $(CONFIG_NUT_CLIENTS_UPSSCHED),/etc/nut/upssched.conf) + $(if $(CONFIG_NUT_SERVER),/etc/nut/ups.conf) + $(if $(CONFIG_NUT_SERVER),/etc/nut/upsd.conf) + $(if $(CONFIG_NUT_SERVER),/etc/nut/upsd.users) +endef + +define Package/nut/install + $(INSTALL_DIR) $(1)/etc/nut + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/nut.conf.sample $(1)/etc/nut/nut.conf + $(if $(or $(CONFIG_NUT_CLIENTS_UPSC),\ + $(CONFIG_NUT_CLIENTS_UPSCMD),\ + $(CONFIG_NUT_CLIENTS_LOG),\ + $(CONFIG_NUT_CLIENTS_UPSRW),\ + $(CONFIG_NUT_CLIENTS_UPSMON),\ + $(CONFIG_NUT_CLIENTS_UPSSCHED)),$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupsclient.so* $(1)/usr/lib/) + $(if $(or $(CONFIG_NUT_SERVER),\ + $(CONFIG_NUT_CLIENTS_UPSMON)),$(INSTALL_DIR) $(1)/etc/init.d) + $(if $(CONFIG_NUT_SERVER),$(INSTALL_DIR) $(1)/lib/nut) + $(if $(CONFIG_NUT_SERVER),$(INSTALL_DIR) $(1)/usr/share/nut) + $(if $(CONFIG_NUT_SERVER),$(CP) ./files/nut-server.init $(1)/etc/init.d/) + $(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upsd $(1)/usr/sbin) + $(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upsdrvctl $(1)/usr/sbin) + $(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/share/nut/cmdvartab $(1)/usr/share/nut/) + $(if $(CONFIG_NUT_SERVER),$(CP) $(PKG_INSTALL_DIR)/usr/share/nut/driver.list $(1)/usr/share/nut/) + $(if $(CONFIG_NUT_SERVER),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/ups.conf.sample $(1)/etc/nut/ups.conf) + $(if $(CONFIG_NUT_SERVER),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.conf.sample $(1)/etc/nut/upsd.conf) + $(if $(CONFIG_NUT_SERVER),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.users.sample $(1)/etc/nut/upsd.users) + $(if $(CONFIG_NUT_CLIENTS_UPSC),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upsc $(1)/usr/bin/) + $(if $(CONFIG_NUT_CLIENTS_UPSCMD),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upscmd $(1)/usr/bin/) + $(if $(CONFIG_NUT_CLIENTS_LOG),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upslog $(1)/usr/bin/) + $(if $(CONFIG_NUT_CLIENTS_UPSRW),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upsrw $(1)/usr/bin/) + $(if $(CONFIG_NUT_CLIENTS_UPSMON),$(CP) ./files/nut-monitor.init $(1)/etc/init.d/) + $(if $(CONFIG_NUT_CLIENTS_UPSMON),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upsmon $(1)/usr/sbin/) + $(if $(CONFIG_NUT_CLIENTS_UPSMON),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsmon.conf.sample $(1)/etc/nut/upsmon.conf) + $(if $(CONFIG_NUT_CLIENTS_UPSSCHED),$(CP) $(PKG_INSTALL_DIR)/usr/bin/upssched-cmd $(1)/usr/bin/) + $(if $(CONFIG_NUT_CLIENTS_UPSSCHED),$(CP) $(PKG_INSTALL_DIR)/usr/sbin/upssched $(1)/usr/sbin/) + $(if $(CONFIG_NUT_CLIENTS_UPSSCHED),$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upssched.conf.sample $(1)/etc/nut/upssched.conf) +endef + +# Dealing with all of the drivers is very repetitive, but the previous +# maintainer had a neat solution which just needed some tweaking. +define DriverPackage + define Package/nut-driver-$(2) + $(call Package/nut/Default) + TITLE:=$(2) (NUT $(1) driver) + $(if $(filter $(1),serial),DEPENDS+= @NUT_DRIVER_SERIAL) + $(if $(filter $(1),snmp),DEPENDS+= @NUT_DRIVER_SNMP) + $(if $(filter $(1),usb),DEPENDS+= @NUT_DRIVER_USB) + endef + # Deliberately empty description in order to trigger a build failure. + # It should be overridden by the list below, and when updating to a + # new version of nut we will need to provide descriptions for any new + # drivers. + define Package/nut-driver-$(2)/description + + endef + define Package/nut-driver-$(2)/install + $(INSTALL_DIR) $$(1)/lib/nut + $(CP) $$(PKG_INSTALL_DIR)/lib/nut/$(2) $$(1)/lib/nut/ + $(if $(filter $(2),clone),$(CP) $$(PKG_INSTALL_DIR)/lib/nut/$(2)-outlet $$(1)/lib/nut/) + endef +endef +define DriverDescription + define Package/nut-driver-$(2)/description + $(3) + endef +endef +# These lists are lifted *directly* from drivers/Makefile.am in the nut +# source tree. This it to make it simpler to keep in sync when updating +# to a newer version of nut. Do not edit this manually. +# +# DO NOT EDIT (except to update with a fresh cut/paste)! +SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom \ + bestfortress bestuferrups bestups dummy-ups etapro everups \ + gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys \ + oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino \ + safenet skel solis tripplite tripplitesu upscode2 victronups powerpanel \ + blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser \ + nutdrv_qx +SNMP_DRIVERLIST = snmp-ups +USB_LIBUSB_DRIVERLIST = usbhid-ups bcmxcp_usb tripplite_usb \ + blazer_usb richcomm_usb riello_usb \ + nutdrv_atcl_usb \ + nutdrv_qx +# END: DO NOT EDIT! +SERIAL_DRIVERLIST_IGNORE:=skel clone-outlet nutdrv_qx +# nutdrv_qx can be either USB or serial. Given most routers have USB +# instead of serial ports, and not wanting two identical packages with +# different names that conflict with each other, only the option for the +# driver with USB bindings is provided. If you really want to save that +# tiny bit of space and build it without USB support, remove nutdrv_qx +# from the previous line. + +$(foreach d,$(filter-out $(SERIAL_DRIVERLIST_IGNORE),$(SERIAL_DRIVERLIST)),$(eval $(call DriverPackage,serial,$(d)))) +$(foreach d,$(SNMP_DRIVERLIST),$(eval $(call DriverPackage,snmp,$(d)))) +$(foreach d,$(USB_LIBUSB_DRIVERLIST),$(eval $(call DriverPackage,usb,$(d)))) + +$(eval $(call DriverDescription,serial,al175,\ + Driver for Eltek UPS models with AL175 alarm module)) +$(eval $(call DriverDescription,serial,bcmxcp,\ + Driver for UPSes supporting the serial BCM/XCP protocol)) +$(eval $(call DriverDescription,serial,belkin,\ + Driver for Belkin serial UPS equipment)) +$(eval $(call DriverDescription,serial,belkinunv,\ + Driver for Belkin "Universal UPS" and compatible)) +$(eval $(call DriverDescription,serial,bestfcom,\ + Driver for Best Power Fortress/Ferrups)) +$(eval $(call DriverDescription,serial,bestfortress,\ + Driver for old Best Fortress UPS equipment)) +$(eval $(call DriverDescription,serial,bestuferrups,\ + Driver for Best Power Micro-Ferrups)) +$(eval $(call DriverDescription,serial,bestups,\ + Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment)) +$(eval $(call DriverDescription,serial,dummy-ups,\ + Driver for multi-purpose UPS emulation)) +$(eval $(call DriverDescription,serial,etapro,\ + Driver for ETA UPS equipment)) +$(eval $(call DriverDescription,serial,everups,\ + Driver for Ever UPS models)) +$(eval $(call DriverDescription,serial,gamatronic,\ + Driver for Gamatronic UPS equipment)) +$(eval $(call DriverDescription,serial,genericups,\ + Driver for contact-closure UPS equipment)) +$(eval $(call DriverDescription,serial,isbmex,\ + Driver for ISBMEX UPS equipment)) +$(eval $(call DriverDescription,serial,liebert,\ + Driver for Liebert contact-closure UPS equipment)) +$(eval $(call DriverDescription,serial,liebert-esp2,\ + Driver for Liebert UPS, using the ESP-II serial protocol)) +$(eval $(call DriverDescription,serial,masterguard,\ + Driver for Masterguard UPS equipment)) +$(eval $(call DriverDescription,serial,metasys,\ + Driver for Meta System UPS equipment)) +$(eval $(call DriverDescription,serial,oldmge-shut,\ + Driver for SHUT Protocol UPS equipment, deprecated, use mge-shut)) +$(eval $(call DriverDescription,serial,mge-utalk,\ + Driver for MGE UPS SYSTEMS UTalk protocol equipment)) +$(eval $(call DriverDescription,serial,microdowell,\ + Driver for Microdowell Enterprise UPS series)) +$(eval $(call DriverDescription,serial,mge-shut,\ + Driver for SHUT Protocol UPS equipment)) +$(eval $(call DriverDescription,serial,oneac,\ + Driver for Oneac UPS equipment)) +$(eval $(call DriverDescription,serial,optiups,\ + Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment)) +$(eval $(call DriverDescription,serial,powercom,\ + Driver for serial Powercom/Trust/Advice UPS equipment)) +$(eval $(call DriverDescription,serial,rhino,\ + Driver for Brazilian Microsol RHINO UPS equipment)) +$(eval $(call DriverDescription,serial,safenet,\ + Driver for SafeNet compatible UPS equipment)) +$(eval $(call DriverDescription,serial,solis,\ + Driver for Brazilian Microsol SOLIS UPS equipment)) +$(eval $(call DriverDescription,serial,tripplite,\ + Driver for Tripp-Lite SmartPro UPS equipment)) +$(eval $(call DriverDescription,serial,tripplitesu,\ + Driver for Tripp-Lite SmartOnline (SU) UPS equipment)) +$(eval $(call DriverDescription,serial,upscode2,\ + Driver for UPScode II compatible UPS equipment)) +$(eval $(call DriverDescription,serial,victronups,\ + Driver for IMV/Victron UPS unit Match, Match Lite, NetUps)) +$(eval $(call DriverDescription,serial,powerpanel,\ + Driver for PowerPanel Plus compatible UPS equipment)) +$(eval $(call DriverDescription,serial,blazer_ser,\ + Driver for Megatec/Q1 protocol serial based UPS equipment)) +$(eval $(call DriverDescription,serial,clone,\ + UPS driver clone)) +$(eval $(call DriverDescription,serial,ivtscd,\ + Driver for the IVT Solar Controller Device)) +$(eval $(call DriverDescription,serial,apcsmart,\ + Driver for American Power Conversion Smart Protocol UPS equipment)) +$(eval $(call DriverDescription,serial,apcsmart-old,\ + Driver for American Power Conversion Smart Protocol UPS equipment)) +$(eval $(call DriverDescription,serial,apcupsd-ups,\ + Driver for apcupsd client access)) +$(eval $(call DriverDescription,serial,riello_ser,\ + Driver for Riello UPS Protocol UPS equipment)) +$(eval $(call DriverDescription,snmp,snmp-ups,\ + Multi-MIB Driver for SNMP UPS equipment)) +$(eval $(call DriverDescription,usb,usbhid-ups,\ + Driver for USB/HID UPS equipment)) +$(eval $(call DriverDescription,usb,bcmxcp_usb,\ + Experimental driver for UPSes supporting the BCM/XCP protocol over USB)) +$(eval $(call DriverDescription,usb,tripplite_usb,\ + Driver for older Tripp Lite USB UPSes (not PDC HID))) +$(eval $(call DriverDescription,usb,blazer_usb,\ + Driver for Megatec/Q1 protocol USB based UPS equipment)) +$(eval $(call DriverDescription,usb,richcomm_usb,\ + Driver for UPS equipment using Richcomm dry-contact to USB solution)) +$(eval $(call DriverDescription,usb,riello_usb,\ + Driver for Riello UPS Protocol UPS equipment via USB)) +$(eval $(call DriverDescription,usb,nutdrv_atcl_usb,\ + Driver for ATCL FOR UPS equipment)) +$(eval $(call DriverDescription,usb,nutdrv_qx,\ + Driver for Q* protocol serial and USB based UPS equipment)) + +CONFIGURE_ARGS += \ + --$(if $(CONFIG_NUT_DRIVER_SERIAL),with,without)-serial \ + --$(if $(CONFIG_NUT_DRIVER_USB),with,without)-usb \ + --$(if $(CONFIG_NUT_DRIVER_SNMP),with,without)-snmp \ + --without-neon \ + --without-powerman \ + --without-ipmi \ + --without-freeipmi \ + --$(if $(CONFIG_NUT_SSL),with,without)-ssl $(if $(CONFIG_NUT_SSL),--with-openssl) \ + --without-avahi \ + --without-libltdl \ + --with-user=root \ + --with-group=root \ + --sysconfdir=/etc/nut \ + --with-drvpath=/lib/nut \ + --with-statepath=/var/run \ + --datadir=/usr/share/nut + +$(eval $(call BuildPackage,nut)) +$(foreach d,$(filter-out $(SERIAL_DRIVERLIST_IGNORE),$(SERIAL_DRIVERLIST)),$(eval $(call BuildPackage,nut-driver-$(d)))) +$(foreach d,$(SNMP_DRIVERLIST),$(eval $(call BuildPackage,nut-driver-$(d)))) +$(foreach d,$(USB_LIBUSB_DRIVERLIST),$(eval $(call BuildPackage,nut-driver-$(d)))) diff --git a/net/nut/files/nut-monitor.init b/net/nut/files/nut-monitor.init new file mode 100755 index 000000000..e9fdb336d --- /dev/null +++ b/net/nut/files/nut-monitor.init @@ -0,0 +1,21 @@ +#!/bin/sh /etc/rc.common + +START=60 +USE_PROCD=1 + +restart() { + stop_service + start_service +} + +start_service() { + upsmon -p +} + +stop_service() { + upsmon -c stop +} + +reload_service() { + upsmon -c reload +} diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init new file mode 100755 index 000000000..f9971be44 --- /dev/null +++ b/net/nut/files/nut-server.init @@ -0,0 +1,23 @@ +#!/bin/sh /etc/rc.common + +START=50 +USE_PROCD=1 + +restart() { + stop_service + start_service +} + +start_service() { + upsdrvctl start + upsd +} + +stop_service() { + upsd -c stop + upsdrvctl stop +} + +reload_service() { + upsd -c reload +} diff --git a/net/nut/patches/001-fix-missing-libmath-flags.patch b/net/nut/patches/001-fix-missing-libmath-flags.patch new file mode 100644 index 000000000..88996be6e --- /dev/null +++ b/net/nut/patches/001-fix-missing-libmath-flags.patch @@ -0,0 +1,22 @@ +--- a/drivers/Makefile.am ++++ b/drivers/Makefile.am +@@ -171,7 +171,7 @@ tripplite_usb_SOURCES = tripplite_usb.c + tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + + bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c +-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) ++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + + blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c + blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm +--- a/drivers/Makefile.in ++++ b/drivers/Makefile.in +@@ -785,7 +785,7 @@ usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LI + tripplite_usb_SOURCES = tripplite_usb.c libusb.c usb-common.c + tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c +-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) ++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c + blazer_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm + nutdrv_atcl_usb_SOURCES = nutdrv_atcl_usb.c usb-common.c diff --git a/net/nut/patches/010-ignore_automake_k_bug.patch b/net/nut/patches/010-ignore_automake_k_bug.patch new file mode 100644 index 000000000..8d3645d09 --- /dev/null +++ b/net/nut/patches/010-ignore_automake_k_bug.patch @@ -0,0 +1,28 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -431,12 +431,6 @@ distclean-libtool: + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -456,12 +450,6 @@ $(RECURSIVE_TARGETS): + + $(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \