diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/dbus-glib | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dbus-glib')
| -rw-r--r-- | package/dbus-glib/Makefile | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile index a937f5971..204c66f50 100644 --- a/package/dbus-glib/Makefile +++ b/package/dbus-glib/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dbus-glib PKG_VERSION:= 0.86 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= cd0ab148fb0c786fc88be49d19971f50 PKG_DESCR:= DBUS glib bindings PKG_SECTION:= libs @@ -13,15 +13,11 @@ PKG_DEPENDS:= dbus glib PKG_BUILDDEP:= dbus glib PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/ - -PKG_SUBPKGS:= DBUS_GLIB DBUS_GLIB_DEV -PKGSC_DBUS_GLIB_DEV:= devel -PKGSD_DBUS_GLIB_DEV:= dbus-glib headers +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DBUS_GLIB_DEV,dbus-glib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_GLIB_DEV},${PKGSC_DBUS_GLIB_DEV})) +$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-checks @@ -32,15 +28,4 @@ dbus-glib-install: $(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \ $(IDIR_DBUS_GLIB)/usr/lib -dbus-glib-dev-install: - $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/include - $(CP) $(WRKINST)/usr/include/* \ - $(IDIR_DBUS_GLIB_DEV)/usr/include - $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig - ${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \ - $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig - $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/dbus-binding-tool \ - $(IDIR_DBUS_GLIB_DEV)/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk |