python packaging related cleanups for rdiff-backup and rrdtool

[openwrt/svn-archive/archive.git] / utils / rrdtool / Makefile

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index 20f86797120765f4f2c8a967abac5bab8fadab36..ecff3ff3de32f5594579d57d2700016f62dbb493 100644 (file)
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -16,10 +16,11 @@ PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=dafa161bc9c61e57636a6085c87c1fe8
 
-PKG_BUILD_DEPENDS:=libnotimpl python-core
+PKG_BUILD_DEPENDS:=python libnotimpl
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,./python-package.mk)
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
 define Package/rrdtool/Default
   SECTION:=utils
@@ -47,9 +48,13 @@ $(call Package/rrdtool/Default)
   DEPENDS+= +librrd
 endef
 
-define Package/rrdpy
-  TITLE:=Round Robin Database (RRD) python bindings (v1.2.x)
-  DEPENDS+= +librrd
+define Package/python-rrd
+$(call Package/rrdtool/Default)
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE+= python bindings (v1.2.x)
+  DEPENDS+= python-core +librrd
 endef
 
 CONFIGURE_ARGS += \
@@ -65,7 +70,6 @@ CONFIGURE_ARGS += \
        --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \
 
 CONFIGURE_VARS += \
-       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
        LIBS="-lnotimpl" \
        rd_cv_ieee_works=yes \
        rd_cv_null_realloc=nope \
@@ -77,7 +81,7 @@ else
   CONFIGURE_ARGS += --disable-rrdcgi
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_rrdpy),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_python-rrd),)
   CONFIGURE_ARGS += \
        --enable-python
   CONFIGURE_VARS += \
@@ -86,15 +90,9 @@ else
   CONFIGURE_ARGS += --disable-python
 endif
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir)
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+       $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
@@ -102,39 +100,37 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/include/
        mkdir -p $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/rrd.h \
-               $(STAGING_DIR)/usr/lib/librrd.{a,so*} 
-endef
-
-define Package/librrd/install  
+define Package/librrd/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
        $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
                $(1)/usr/share/rrdtool/fonts/
 endef
 
-define Package/rrdcgi/install  
+define Package/rrdcgi/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
-endef
-
-define PyPackage/rrdpy/install
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
 endef
 
 define Package/rrdtool/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
+endef
+
+define PyPackage/python-rrd/install
+       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+       $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
 endef
 
 $(eval $(call BuildPackage,librrd))
 $(eval $(call BuildPackage,rrdcgi))
-$(eval $(call PyPackage,rrdpy))
-$(eval $(call BuildPackage,rrdpy))
 $(eval $(call BuildPackage,rrdtool))
+
+$(eval $(call PyPackage,python-rrd))
+$(eval $(call BuildPackage,python-rrd))