[packages] Update dependencies on gtk to match

[openwrt/svn-archive/archive.git] / XOrg / app / xmms / Makefile

diff --git a/XOrg/app/xmms/Makefile b/XOrg/app/xmms/Makefile
index cf23abfaf0d5606f414e362018bcb35e00041219..b4b338d8566ff84c523b9e4d10e566a88e71504b 100644 (file)
--- a/XOrg/app/xmms/Makefile
+++ b/XOrg/app/xmms/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.xmms.org/files/1.2.x/
 #PKG_INSTALL_MAN:=$(PKG_INSTALL_DIR)/usr/man
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.xmms.org/files/1.2.x/
 #PKG_INSTALL_MAN:=$(PKG_INSTALL_DIR)/usr/man

+PKG_FIXUP = libtool

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -21,7 +22,7 @@ define Package/xmms
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app

-  DEPENDS:=+xorg-server-essentials +alsa-lib +gtk-1.2.10 +libnotimpl
+  DEPENDS:=+xorg-server-essentials +alsa-lib +gtk1 +libnotimpl

   TITLE:=XMMS audio player
 endef
 
   TITLE:=XMMS audio player
 endef
 


@@ -33,7 +34,11 @@ CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl" \
        sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
        sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
        --disable-mikmod \
        sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
        sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
        --disable-mikmod \

-       --disable-vorbis
+       --disable-vorbis \
+       --disable-esd
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/gtk-1.2 -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
+TARGET_LDFLAGS += -lgthread

 
 define Build/Configure
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \


@@ -49,12 +54,15 @@ define Build/Configure
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR) 
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install 
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR=$(PKG_INSTALL_DIR) \
+               LIBTOOL="libtool --tag=CC" \
+               all install

 endef
 
 define Package/xmms/install
 endef
 
 define Package/xmms/install

-       $(call pkg_install_files,$(1),/usr/bin/xmms /usr/lib/libxmms.so /usr/lib/libxmms.so.1 /usr/lib/libxmms.so.1.3.1 /usr/share/xmms/)
+       $(call pkg_install_files,/usr/lib/libxmms.so /usr/lib/libxmms.so.1 /usr/lib/libxmms.so.1.3.1 /usr/share/xmms/wmxmms.xpm,$(PKG_INSTALL_DIR),$(1))
+       $(call pkg_install_bin,/usr/bin/xmms,$(PKG_INSTALL_DIR),$(1))

 endef
 
 $(eval $(call BuildPackage,xmms))
 endef
 
 $(eval $(call BuildPackage,xmms))