fix xmms compile

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9771 3c298f89-4303-0410-b956-a3cf2f4a3e73

XOrg/app/xmms/Makefile

@@ -33,7 +33,10 @@ 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 \
-	--disable-vorbis
+	--disable-vorbis \
+	--disable-esd
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/gtk-1.2
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
@@ -46,6 +49,7 @@ define Build/Configure
 			$(CONFIGURE_ARGS) ;\
 		fi \
 	)
+	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
@@ -54,7 +58,7 @@ define Build/Compile
 endef
 
 define Package/xmms/install
-	$(call pkg_install_files,$(PKG_INSTALL_DIR),$(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/bin/xmms /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))
 endef
 
 $(eval $(call BuildPackage,xmms))

XOrg/lib/libX11/Makefile

@@ -49,7 +49,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
@@ -63,6 +62,7 @@ define Build/Configure
 		--enable-malloc0returnsnull; \
 	fi \
 	)
+	$(call libtool_disable_rpath)
 endef
 
 define Package/libX11/install/Default
@@ -80,6 +80,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 

XOrg/lib/libXext/Makefile

@@ -49,7 +49,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
@@ -63,6 +62,7 @@ define Build/Configure
 		--enable-malloc0returnsnull; \
 	fi \
 	)
+	$(call libtool_disable_rpath)
 endef
 
 define Package/libXext/install/Default
@@ -80,6 +80,7 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)
 endef
 

libs/alsa-lib/Makefile

@@ -53,15 +53,15 @@ endef
 define Build/Compile
 	# override AM_CFLAGS holding inappropriate optimization flags
 	$(MAKE) -C $(PKG_BUILD_DIR) AM_CFLAGS="" all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
 	mkdir -p $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/alsa $(1)/usr/include/
 	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{la,a,so*} $(1)/usr/lib/
 	mkdir -p $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc $(1)/usr/lib/pkgconfig/
 endef

libs/glib/Makefile

@@ -61,22 +61,14 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(1)/usr/bin/
+	$(CP) $(PKG_BUILD_DIR)/.libs/*.a $(PKG_BUILD_DIR)/*/.libs/*.a $(1)/usr/lib
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(1)/usr/lib/
-	mkdir -p $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,-I$$$${prefix}/include/glib,-I$(1)/usr/include/glib,g' $(1)/usr/bin/glib-config
 	$(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(1)/usr/lib/glib,g' $(1)/usr/bin/glib-config
 	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config