jansson: moved to github

[packages.git] / libs / dbus-glib / Makefile

diff --git a/libs/dbus-glib/Makefile b/libs/dbus-glib/Makefile
index a076290..8a79f98 100644 (file)
--- a/libs/dbus-glib/Makefile
+++ b/libs/dbus-glib/Makefile
@@ -1,32 +1,37 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus-glib
-PKG_VERSION:=0.74
+PKG_VERSION:=0.80
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus-glib/
-PKG_MD5SUM:=
+PKG_MD5SUM:=86ea60ba2118a1b9deafe8257f6a6a1a
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 
 define Package/libdbus-glib
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=D-Bus Glib bindings
- URL:=http://dbus.freedesktop.org/doc/dbus-glib/
- DEPENDS:= +dbus +glib2 +libiconv +libintl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=D-Bus Glib bindings
+  URL:=http://dbus.freedesktop.org/doc/dbus-glib/
+  DEPENDS:=+libdbus +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
+TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
        --enable-shared \
@@ -38,39 +43,28 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS+= \
        ac_cv_func_posix_getpwnam_r="yes" \
        ac_cv_have_abstract_sockets="yes" \
-       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \
-       LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-       LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \
-
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+       CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
+       CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
+       LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
+       LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include/dbus-1.0/dbus
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/dbus-1.0/dbus/dbus-glib{,-error-enum,-lowlevel}.h \
-               $(PKG_INSTALL_DIR)/usr/include/dbus-1.0/dbus/dbus-gtype-specialized.h \
-               $(STAGING_DIR)/usr/include//dbus-1.0/dbus/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.{a,so*} \
-               $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc \
-               $(STAGING_DIR)/usr/lib/pkgconfig/
-endef
+       $(INSTALL_DIR) $(1)/usr/include/dbus-1.0/dbus
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/dbus-1.0/dbus/*.h \
+               $(1)/usr/include/dbus-1.0/dbus/
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/dbus-1.0/dbus/dbus-glib{,-error-enum,-lowlevel}.h \
-               $(STAGING_DIR)/usr/include/dbus-1.0/dbus/dbus-gtype-specialized.h \
-               $(STAGING_DIR)/usr/lib/libdbus-glib-1.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.{la,a,so*} \
+               $(1)/usr/lib/
+
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc \
+               $(1)/usr/lib/pkgconfig/
 endef
 
-
 define Package/libdbus-glib/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.so.* $(1)/usr/lib/
@@ -78,4 +72,3 @@ endef
 
 
 $(eval $(call BuildPackage,libdbus-glib))
-