X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Fcwiid%2FMakefile;h=4a79f9d6ea0019e71bab3f038f38b7213c69675e;hb=32d18992b62ddc6a119b8f29c7a9ee48c02604b2;hp=2c045ba17b71ec0b11482e8908b5553a558f68bd;hpb=9759a26b21d67a770437e24087b2e760a6d01c4a;p=packages.git

diff --git a/utils/cwiid/Makefile b/utils/cwiid/Makefile
index 2c045ba17..4a79f9d6e 100644
--- a/utils/cwiid/Makefile
+++ b/utils/cwiid/Makefile
@@ -9,36 +9,56 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cwiid
 PKG_VERSION:=0.6.00
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://abstrakraft.org/cwiid/downloads/
 PKG_SOURCE_VERSION:=2100f14c612471084434b364501e3818c7f4144e
 
+PKG_BUILD_DEPENDS:=python
+
 include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/cwiid/Default
+  TITLE:=Linux Nintendo Wiimote interface
+  URL:=http://abstrakraft.org/cwiid/
+endef
 
 define Package/libcwiid
+$(call Package/cwiid/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+bluez-libs
-  TITLE:=Linux Nintendo Wiimote interface
-  URL:=http://abstrakraft.org/cwiid/
+  TITLE+= (library)
+  DEPENDS+= +bluez-libs +libpthread +librt
 endef
 
 define Package/wminput
+$(call Package/cwiid/Default)
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libcwiid
-  TITLE:=Linux Nintendo Wiimote interface
-  URL:=http://abstrakraft.org/cwiid/
+  TITLE+= (utility)
+  DEPENDS+= +libcwiid
+endef
+
+define Package/python-cwiid
+$(call Package/cwiid/Default)
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Python bindings for the cwiid libs
+  DEPENDS:= +python-mini +libcwiid
 endef
 
 CONFIGURE_ARGS += \
-		--without-python \
-		--disable-ldconfig \
-		--enable-shared \
+	--without-python \
+	--disable-ldconfig \
+	--enable-shared \
+	--enable-static \
 
 TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/libcwiid/
+TARGET_LDFLAGS += -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
@@ -54,12 +74,16 @@ define Build/Compile
 		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) -L../libcwiid/" \
 		all
+	$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
+	$(call Build/Compile/PyMod,./python/, \
+		install --prefix="$(PKG_INSTALL_DIR)/usr", \
+	)
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_BUILD_DIR)/libcwiid/*.h $(1)/usr/include/
-	mkdir -p $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libcwiid/*.so $(1)/usr/lib/
 endef
 
@@ -74,5 +98,11 @@ define Package/wminput/install
 	$(CP) $(PKG_BUILD_DIR)/lswm/lswm $(1)/usr/bin/
 endef
 
+define PyPackage/python-cwiid/filespec
++|$(PYTHON_PKG_DIR)/cwiid.so
+endef
+
 $(eval $(call BuildPackage,libcwiid))
 $(eval $(call BuildPackage,wminput))
+$(eval $(call PyPackage,python-cwiid))
+$(eval $(call BuildPackage,python-cwiid))