X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/14428f9a610d763126cbcf9b841dd2140aa7d8eb..986deefdb48e2ec9ab63f17c256981e72c3c8999:/openwrt/package/glib/Makefile?ds=sidebyside diff --git a/openwrt/package/glib/Makefile b/openwrt/package/glib/Makefile index cbbd48678..cb697995d 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 \ @@ -72,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) \ @@ -82,22 +81,22 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(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 @@ -110,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