summaryrefslogtreecommitdiff
path: root/package/gtk+/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:25:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:25:35 +0200
commit98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch)
treea68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/gtk+/Makefile
parent09d28322f4828a387eeee03d303c833eab8828c5 (diff)
parent32a82e38679501da738199135b35f93ddc8aca0a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/gtk+/Makefile')
-rw-r--r--package/gtk+/Makefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index a97499549..24d7ce1d0 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -16,21 +16,20 @@ PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libgtk
+PKG_OPTS:= dev
-PKG_SUBPKGS:= LIBGTK LIBGTK_DEV
-PKGSC_LIBGTK_DEV:= devel
-PKGSD_LIBGTK_DEV:= GTK+ headers
+PKG_ARCH_DEPENDS:= !m68k
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGTK_DEV,libgtk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGTK_DEV},${PKGSC_LIBGTK_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-gtk-doc-html \
--disable-modules \
@@ -48,14 +47,9 @@ libgtk-install:
${CP} ${WRKINST}/usr/lib/libgdk-x11*so* ${IDIR_LIBGTK}/usr/lib
${CP} ${WRKINST}/usr/lib/libgtk-x11*so* ${IDIR_LIBGTK}/usr/lib
${CP} ${WRKINST}/usr/lib/libgailutil*so* ${IDIR_LIBGTK}/usr/lib
-
-libgtk-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGTK_DEV}/usr/include
+ # workaround dev subpackage
${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
${CP} ${WRKINST}/usr/lib/gtk-2.0/include/* \
${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
- ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk