packages: fix pkgconfig depencies and select pkgconfig where needed

This commit is contained in:
Peter Korsgaard 2008-06-14 21:01:16 +00:00
parent 43f18ea31c
commit 565e05c8a1
34 changed files with 36 additions and 15 deletions

View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_DBUS_GLIB
default n default n
depends on BR2_PACKAGE_DBUS depends on BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PKGCONFIG
help help
GLib bindings for D-Bus. GLib bindings for D-Bus.

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_DBUS
bool "dbus" bool "dbus"
default n default n
depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2 depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_PKGCONFIG
help help
The D-Bus message bus system. The D-Bus message bus system.

View File

@ -83,7 +83,7 @@ ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man rm -rf $(TARGET_DIR)/usr/share/man
endif endif
dbus: uclibc $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY) dbus: uclibc pkgconfig $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY)
dbus-clean: dbus-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/session.conf rm -f $(TARGET_DIR)/etc/dbus-1/session.conf

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_VIM
bool "vim" bool "vim"
default n default n
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_PKGCONFIG
help help
VIM Text editor VIM Text editor

View File

@ -86,7 +86,7 @@ ifeq ($(R2_PACKAGE_VIM_RUNTIME),y)
) )
endif endif
vim: ncurses vim-source $(TARGET_DIR)/usr/bin/vim vim: uclibc pkgconfig ncurses vim-source $(TARGET_DIR)/usr/bin/vim
############################################################# #############################################################
# #

View File

@ -3,6 +3,7 @@
config BR2_PACKAGE_EXPAT config BR2_PACKAGE_EXPAT
bool"expat" bool"expat"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
The Expat XML Parser. The Expat XML Parser.

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_FREETYPE config BR2_PACKAGE_FREETYPE
bool "freetype" bool "freetype"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
a free, high-quality and portable font engine. a free, high-quality and portable font engine.

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_GETTEXT config BR2_PACKAGE_GETTEXT
bool "gettext" bool "gettext"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
The GNU `gettext' utilities are a set of tools that provide a The GNU `gettext' utilities are a set of tools that provide a
framework to help other GNU packages produce multi-lingual framework to help other GNU packages produce multi-lingual

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_GQVIEW config BR2_PACKAGE_GQVIEW
bool "gqview" bool "gqview"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
GQview is an image viewer for Unix operating systems (developed on Linux). GQview is an image viewer for Unix operating systems (developed on Linux).

View File

@ -12,7 +12,7 @@ GQVIEW_INSTALL_TARGET = YES
GQVIEW_CONF_OPT = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig GQVIEW_CONF_OPT = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
GQVIEW_DEPENDENCIES = uclibc libgtk2 GQVIEW_DEPENDENCIES = uclibc pkgconfig libgtk2
$(eval $(call AUTOTARGETS,package,gqview)) $(eval $(call AUTOTARGETS,package,gqview))

View File

@ -5,5 +5,6 @@ config BR2_PACKAGE_HAL
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA
select BR2_PACKAGE_UDEV_VOLUME_ID select BR2_PACKAGE_UDEV_VOLUME_ID
select BR2_PACKAGE_PKGCONFIG
help help
The Hardware Abstraction Layer (HAL) suite. The Hardware Abstraction Layer (HAL) suite.

View File

@ -89,7 +89,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
done done
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal* -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
hal: uclibc dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY) hal: uclibc pkgconfig dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY)
hal-clean: hal-clean:
rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf

View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_CLASSPATH config BR2_PACKAGE_CLASSPATH
bool "classpath" bool "classpath"
select BR2_PACKAGE_PKGCONFIG
default n default n
help help

View File

@ -58,7 +58,7 @@ CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ --disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
--disable-gconf-peer --disable-examples --disable-plugin --disable-gconf-peer --disable-examples --disable-plugin
CLASSPATH_DEPENDENCIES = uclibc png jpeg tiff CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff
ifeq ($(BR2_PACKAGE_ALSA_LIB),y) ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
CLASSPATH_DEPENDENCIES+= alsa-lib CLASSPATH_DEPENDENCIES+= alsa-lib

View File

@ -2,7 +2,7 @@ config BR2_PACKAGE_JAMVM
bool "jamvm" bool "jamvm"
default n default n
depends on BR2_PACKAGE_CLASSPATH depends on BR2_PACKAGE_CLASSPATH
select BR2_PACKAGE_PKGCONFIG
help help
JamVM is a new Java Virtual Machine which conforms to JamVM is a new Java Virtual Machine which conforms to
the JVM specification version 2 (blue book). the JVM specification version 2 (blue book).

View File

@ -57,7 +57,7 @@ JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--with-classpath-install-dir=/usr \ --with-classpath-install-dir=/usr \
JAMVM_DEPENDENCIES = uclibc classpath JAMVM_DEPENDENCIES = uclibc pkgconfig classpath
#Include X libraries when we have an X server #Include X libraries when we have an X server
ifneq ($(BR2_PACKAGE_XSERVER_none),y) ifneq ($(BR2_PACKAGE_XSERVER_none),y)

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBDAEMON config BR2_PACKAGE_LIBDAEMON
bool "libdaemon" bool "libdaemon"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
libdaemon is a lightweight C library that eases the libdaemon is a lightweight C library that eases the
writing of UNIX daemons. writing of UNIX daemons.

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBDRM config BR2_PACKAGE_LIBDRM
bool "libdrm" bool "libdrm"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
Direct Rendering Manager Direct Rendering Manager

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBGTK2 config BR2_PACKAGE_LIBGTK2
bool "libgtk2" bool "libgtk2"
default n default n
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_ATK select BR2_PACKAGE_ATK
select BR2_PACKAGE_PANGO select BR2_PACKAGE_PANGO
select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO

View File

@ -74,6 +74,6 @@ else
LIBGTK2_CONF_OPT += --without-x LIBGTK2_CONF_OPT += --without-x
endif endif
LIBGTK2_DEPENDENCIES = uclibc png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk LIBGTK2_DEPENDENCIES = uclibc pkgconfig png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk
$(eval $(call AUTOTARGETS,package,libgtk2)) $(eval $(call AUTOTARGETS,package,libgtk2))

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBOGG config BR2_PACKAGE_LIBOGG
bool "libogg" bool "libogg"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
Ogg is the name of Xiph.org's container format for audio, video, and metadata Ogg is the name of Xiph.org's container format for audio, video, and metadata

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBPNG
bool "libpng" bool "libpng"
default n default n
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_PKGCONFIG
help help
Library for handling PNG (Portable Network Graphics) Library for handling PNG (Portable Network Graphics)
images. images.

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBUSB config BR2_PACKAGE_LIBUSB
bool "libusb" bool "libusb"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
Userspace library for accessing USB devices Userspace library for accessing USB devices

View File

@ -59,7 +59,7 @@ $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/usr/lib/libusb.so
cp -dpf $(STAGING_DIR)/usr/lib/libusb*.so* $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/usr/lib/libusb*.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so* $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so*
libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY) libusb: uclibc pkgconfig $(TARGET_DIR)/$(LIBUSB_BINARY)
libusb-clean: libusb-clean:
rm -f $(STAGING_DIR)/bin/libusb-config rm -f $(STAGING_DIR)/bin/libusb-config

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBVORBIS
bool "libvorbis" bool "libvorbis"
default n default n
depends on BR2_PACKAGE_LIBOGG depends on BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_PKGCONFIG
help help
Library for the Vorbis open source audio decoder Library for the Vorbis open source audio decoder
Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_MATCHBOX
bool "MatchBox Window Manager" bool "MatchBox Window Manager"
default n default n
select BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XLIB_LIBXCURSOR

View File

@ -618,7 +618,7 @@ $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_B
cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/ cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/
cp -dpf ./package/matchbox/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ cp -dpf ./package/matchbox/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
matchbox: uclibc expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN) matchbox: uclibc pkgconfig expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN)
matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS) matchbox-panel: uclibc matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS)

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_MIDORI
bool "midori" bool "midori"
select BR2_PACKAGE_WEBKIT select BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_LIBSEXY select BR2_PACKAGE_LIBSEXY
select BR2_PACKAGE_PKGCONFIG
default n default n
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
help help

View File

@ -16,6 +16,6 @@ MIDORI_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
MIDORI_DEPENDENCIES = uclibc webkit libsexy $(XSERVER) MIDORI_DEPENDENCIES = uclibc pkgconfig webkit libsexy $(XSERVER)
$(eval $(call AUTOTARGETS,package,midori)) $(eval $(call AUTOTARGETS,package,midori))

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_NTFS-3G config BR2_PACKAGE_NTFS-3G
bool "ntfs-3g" bool "ntfs-3g"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
The NTFS-3G driver is an open source, freely available read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD, and Haiku. It provides safe and fast handling of the Windows XP, Windows Server 2003, Windows 2000 and Windows Vista file systems. Most POSIX file system operations are supported, with the exception of full file ownership and access right support. The NTFS-3G driver is an open source, freely available read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD, and Haiku. It provides safe and fast handling of the Windows XP, Windows Server 2003, Windows 2000 and Windows Vista file systems. Most POSIX file system operations are supported, with the exception of full file ownership and access right support.

View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PCMANFM config BR2_PACKAGE_PCMANFM
bool "pcmanfm" bool "pcmanfm"
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_GAMIN select BR2_PACKAGE_GAMIN
select BR2_PACKAGE_STARTUP_NOTIFICATION select BR2_PACKAGE_STARTUP_NOTIFICATION
select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBGTK2

View File

@ -13,7 +13,7 @@ PCMANFM_INSTALL_TARGET = YES
PCMANFM_CONF_ENV = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig PCMANFM_CONF_ENV = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
PCMANFM_CONF_OPT = --disable-hal PCMANFM_CONF_OPT = --disable-hal
PCMANFM_DEPENDENCIES = uclibc libgtk2 gamin startup-notification PCMANFM_DEPENDENCIES = uclibc pkgconfig libgtk2 gamin startup-notification
$(eval $(call AUTOTARGETS,package,pcmanfm)) $(eval $(call AUTOTARGETS,package,pcmanfm))

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_SYLPHEED config BR2_PACKAGE_SYLPHEED
bool "sylpheed" bool "sylpheed"
default n default n
select BR2_PACKAGE_PKGCONFIG
help help
lightweight and user-friendly e-mail client. lightweight and user-friendly e-mail client.

View File

@ -14,7 +14,7 @@ SYLPHEED_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
SYLPHEED_CONF_ENV = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig SYLPHEED_CONF_ENV = PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix="" SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix=""
SYLPHEED_DEPENDENCIES = uclibc SYLPHEED_DEPENDENCIES = uclibc pkgconfig
$(eval $(call AUTOTARGETS,package,sylpheed)) $(eval $(call AUTOTARGETS,package,sylpheed))