X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1bcbf401379815eaa2a10978ca901075520272f5..a2759fb484cd09119c6b3914a11b25e3c4571c3e:/package/glib/Makefile?ds=sidebyside

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 5b35fa1ce..cb697995d 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -7,7 +7,10 @@ PKG_VERSION := 1.2.10
 PKG_RELEASE := 1
 PKG_MD5SUM := 6fe30dad87c77b91b632def29dd69ef9
 
-PKG_SOURCE_URL := ftp://ftp.gtk.org/pub/gtk/v1.2
+PKG_SOURCE_URL := ftp://ftp.gtk.org/pub/gtk/v1.2 \
+	http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
+	http://ftp.esat.net/mirrors/ftp.gimp.org/pub/gtk/v1.2/ \
+	http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT := zcat
 
@@ -18,8 +21,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,GLIB1,glib1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		glib_cv_sizeof_gmutex=24 \
 		ac_cv_sizeof_char=1 \
@@ -45,6 +47,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
 		  --host=$(GNU_TARGET_NAME) \
@@ -66,34 +69,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --enable-shared=yes \
 		  --enable-static=yes \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	  	$(TARGET_CONFIGURE_OPTS)
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
-	touch $(PKG_BUILD_DIR)/.built
+	touch $@
 
 $(IPKG_GLIB1):
 	install -m0755 -d $(IDIR_GLIB1)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/
 	$(RSTRIP) $(IDIR_GLIB1)
 	$(IPKG_BUILD) $(IDIR_GLIB1) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libglib.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 	touch $(STAGING_DIR)/usr/lib/libglib.so
 
 install-dev: $(STAGING_DIR)/usr/lib/libglib.so
@@ -106,5 +109,5 @@ uninstall-dev:
 	rm -rf $(STAGING_DIR)/usr/lib/glib
 	rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 
-compile: install-dev
-clean: uninstall-dev
\ No newline at end of file
+compile-targets: install-dev
+clean-targets: uninstall-dev