input-tools: convert to gentargets

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 2d3bbb60b9de071fd6b0c7d5f9985ea30a597138..79dac1b94308aae00fc8c35d22fb872ff33124b5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,9 +5,9 @@
 
        Updated/fixed packages: at, busybox, bzip2, dbus,
        direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf,
-       hostapd, i2c-tools, libconfig, ltp-testsuite, m4, openssh,
-       openssl, openvpn, pango, qt, rsync, sdl_gfx, sdl_sound, udev,
-       usbutils, xz, zlib
+       hostapd, i2c-tools, input-tools, libconfig, ltp-testsuite, m4,
+       openssh, openssl, openvpn, pango, qt, rsync, sdl_gfx,
+       sdl_sound, udev, usbutils, xz, zlib
 
        New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone
 

diff --git a/package/input-tools/input-tools-20051019-rint.patch b/package/input-tools/input-tools-20051019-rint.patch
new file mode 100644 (file)
index 0000000..b2aa13f
--- /dev/null
+++ b/package/input-tools/input-tools-20051019-rint.patch
@@ -0,0 +1,18 @@
+diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
+--- joystick-20051019.orig/utils/jscal.c       2004-10-19 09:51:52.000000000 +0200
++++ joystick-20051019/utils/jscal.c    2009-01-18 10:48:50.000000000 +0100
+@@ -141,10 +141,10 @@
+       c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
+       d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
+ 
+-      results[0] = rint(a);
+-      results[1] = rint(b);
+-      results[2] = rint(c*16384.0);
+-      results[3] = rint(d*16384.0);
++      results[0] = (int) (a + 0.5);
++      results[1] = (int) (b + 0.5);
++      results[2] = (int) (c*16384.0 + 0.5);
++      results[3] = (int) (d*16384.0 + 0.5);
+ 
+       return 1;
+ }

diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 9f5eb19be649761999b81f8d316ebb43fe0e3068..bd85af3cbb3b77de7700f57c5ea3472b59b3ac26 100644 (file)
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -3,64 +3,44 @@
 # input-tools
 #
 #############################################################
-
-INPUT_TOOLS_VERSION:=20051019
-INPUT_TOOLS_SOURCE:=joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
-INPUT_TOOLS_PATCH:=joystick_$(INPUT_TOOLS_VERSION)-2.diff.gz
-INPUT_TOOLS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/j/joystick/
-INPUT_TOOLS_DIR:=$(BUILD_DIR)/joystick-$(INPUT_TOOLS_VERSION).orig
-INPUT_TOOLS_CAT:=$(ZCAT)
-
-INPUT_TOOLS_TARGETS-y:=
-
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_EVTEST) += evtest
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
-INPUT_TOOLS_TARGETS-$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
-
-INPUT_TOOLS_TARGETS := $(addprefix $(TARGET_DIR)/usr/bin/, $(INPUT_TOOLS_TARGETS-y))
-INPUT_TOOLS_SOURCES := $(addprefix $(INPUT_TOOLS_DIR)/utils/, \
-       $(addsuffix .c, $(INPUT_TOOLS_TARGETS-y)))
-
-$(DL_DIR)/$(INPUT_TOOLS_SOURCE):
-       $(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F))
-
-$(DL_DIR)/$(INPUT_TOOLS_PATCH):
-       $(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F))
-
-$(INPUT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH)
-       $(INPUT_TOOLS_CAT) $(DL_DIR)/$(INPUT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-ifneq ($(INPUT_TOOLS_PATCH),)
-       (cd $(INPUT_TOOLS_DIR) && $(INPUT_TOOLS_CAT) $(DL_DIR)/$(INPUT_TOOLS_PATCH) | patch -p1)
-endif
-       toolchain/patch-kernel.sh $(INPUT_TOOLS_DIR) package/input-tools/ \*.patch
-       touch $@
-
-$(INPUT_TOOLS_SOURCES): $(INPUT_TOOLS_DIR)/.unpacked
-
-$(INPUT_TOOLS_DIR)/utils/%: $(INPUT_TOOLS_DIR)/utils/%.c
-       $(TARGET_CC) $(TARGET_CFLAGS) -o $@ $^
-
-$(INPUT_TOOLS_TARGETS): $(TARGET_DIR)/usr/bin/%: $(INPUT_TOOLS_DIR)/utils/%
-       cp -dpf $^ $@
-       $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-input-tools: $(INPUT_TOOLS_TARGETS)
-
-input-tools-source: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH)
-
-input-tools-unpacked: $(INPUT_TOOLS_DIR)/.unpacked
-
-input-tools-clean:
-       rm -f $(INPUT_TOOLS_TARGETS)
-
-input-tools-dirclean:
-       rm -rf $(INPUT_TOOLS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_INPUT_TOOLS),y)
-TARGETS+=input-tools
-endif
+INPUT_TOOLS_VERSION = 20051019
+INPUT_TOOLS_SOURCE  = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
+INPUT_TOOLS_PATCH   = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz
+INPUT_TOOLS_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/j/joystick/
+
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_EVTEST)      += evtest
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL)       += jscal
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST)      += jstest
+
+define INPUT_TOOLS_DEBIAN_PATCHES
+       if [ -d $(@D)/debian/patches ]; then \
+               toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+       fi
+endef
+
+INPUT_TOOLS_POST_PATCH_HOOKS = INPUT_TOOLS_DEBIAN_PATCHES
+
+define INPUT_TOOLS_BUILD_CMDS
+       (cd $(@D)/utils; \
+               $(TARGET_CC) $(TARGET_CFLAGS) -o evtest evtest.c; \
+               $(TARGET_CC) $(TARGET_CFLAGS) -o inputattach inputattach.c; \
+               $(TARGET_CC) $(TARGET_CFLAGS) -o jscal jscal.c; \
+               $(TARGET_CC) $(TARGET_CFLAGS) -o jstest jstest.c; \
+       )
+endef
+
+define INPUT_TOOLS_INSTALL_TARGET_CMDS
+       test -z "$(INPUT_TOOLS_TARGETS_y)" || \
+       install -m 755 $(addprefix $(@D)/utils/,$(INPUT_TOOLS_TARGETS_y)) $(TARGET_DIR)/usr/bin/
+endef
+
+define INPUT_TOOLS_UNINSTALL_TARGET_CMDS
+       rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(INPUT_TOOLS_TARGETS_y))
+endef
+
+define INPUT_TOOLS_CLEAN_CMDS
+       rm -f $(addprefix $(@D)/utils/,$(INPUT_TOOLS_TARGETS_y))
+endef
+
+$(eval $(call GENTARGETS,package,input-tools))

diff --git a/package/input-tools/joystick-20051019-rint.patch b/package/input-tools/joystick-20051019-rint.patch
deleted file mode 100644 (file)
index b2aa13f..0000000
--- a/package/input-tools/joystick-20051019-rint.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
---- joystick-20051019.orig/utils/jscal.c       2004-10-19 09:51:52.000000000 +0200
-+++ joystick-20051019/utils/jscal.c    2009-01-18 10:48:50.000000000 +0100
-@@ -141,10 +141,10 @@
-       c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
-       d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
- 
--      results[0] = rint(a);
--      results[1] = rint(b);
--      results[2] = rint(c*16384.0);
--      results[3] = rint(d*16384.0);
-+      results[0] = (int) (a + 0.5);
-+      results[1] = (int) (b + 0.5);
-+      results[2] = (int) (c*16384.0 + 0.5);
-+      results[3] = (int) (d*16384.0 + 0.5);
- 
-       return 1;
- }