X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/057b42227b41445d5b898a782a38bb8316ca8407..bdd94763c1c3c236e2bd8b2282dad526e08bbb66:/openwrt/package/glib/Makefile diff --git a/openwrt/package/glib/Makefile b/openwrt/package/glib/Makefile index 473e8b635..2715d9fcc 100644 --- a/openwrt/package/glib/Makefile +++ b/openwrt/package/glib/Makefile @@ -21,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 \ @@ -48,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) \ @@ -71,7 +71,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared ); touch $@ -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -109,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 +compile-targets: install-dev +clean-targets: uninstall-dev