diff options
| -rw-r--r-- | package/gmp/Config.in | 6 | ||||
| -rw-r--r-- | package/gmp/gmp.mk | 14 | ||||
| -rw-r--r-- | package/mpfr/Config.in | 10 | ||||
| -rw-r--r-- | package/mpfr/mpfr.mk | 14 |
4 files changed, 22 insertions, 22 deletions
diff --git a/package/gmp/Config.in b/package/gmp/Config.in index 9e15ea37a..41d5ee82a 100644 --- a/package/gmp/Config.in +++ b/package/gmp/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_GMP +config BR2_PACKAGE_LIBGMP bool "gmp" default n help @@ -7,10 +7,10 @@ config BR2_PACKAGE_GMP http://www.swox.com/gmp/ -config BR2_PACKAGE_GMP_HEADERS +config BR2_PACKAGE_LIBGMP_HEADERS bool "gmp headers for target" default n - depends on BR2_PACKAGE_GMP + depends on BR2_PACKAGE_LIBGMP help Install the gmp.h for the target. diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 07fab8861..21e1433e8 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -20,7 +20,7 @@ endif $(DL_DIR)/$(GMP_SOURCE): $(WGET) -P $(DL_DIR) $(GMP_SITE)/$(GMP_SOURCE) -gmp-source: $(DL_DIR)/$(GMP_SOURCE) +libgmp-source: $(DL_DIR)/$(GMP_SOURCE) $(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE) $(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - @@ -75,20 +75,20 @@ $(STAGING_DIR)/lib/$(GMP_BINARY): $(GMP_DIR)/.libs/$(GMP_BINARY) $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION): $(STAGING_DIR)/lib/$(GMP_BINARY) cp -a $(STAGING_DIR)/lib/libgmp.so* $(STAGING_DIR)/lib/libgmp.a \ $(TARGET_DIR)/lib/ -ifeq ($(BR2_PACKAGE_GMP_HEADERS),y) +ifeq ($(BR2_PACKAGE_LIBGMP_HEADERS),y) test -d $(TARGET_DIR)/usr/include || mkdir -p $(TARGET_DIR)/usr/include cp -a $(STAGING_DIR)/include/gmp.h $(TARGET_DIR)/usr/include/ endif $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgmp.so* \ $(TARGET_DIR)/lib/libgmp.a -gmp: uclibc $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) +libgmp: uclibc $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) -gmp-clean: +libgmp-clean: rm -f $(TARGET_DIR)/lib/$(GMP_BINARY) -$(MAKE) -C $(GMP_DIR) clean -gmp-dirclean: +libgmp-dirclean: rm -rf $(GMP_DIR) ############################################################# @@ -96,6 +96,6 @@ gmp-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_GMP)),y) -TARGETS+=gmp +ifeq ($(strip $(BR2_PACKAGE_LIBGMP)),y) +TARGETS+=libgmp endif diff --git a/package/mpfr/Config.in b/package/mpfr/Config.in index 778e79e07..a7dabc959 100644 --- a/package/mpfr/Config.in +++ b/package/mpfr/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_MPFR +config BR2_PACKAGE_LIBMPFR bool "mpfr" default n default y if BR2_INSTALL_FORTRAN - select BR2_PACKAGE_GMP + select BR2_PACKAGE_LIBGMP help C library for multiple-precision floating-point computations with exact rounding. @@ -10,11 +10,11 @@ config BR2_PACKAGE_MPFR http://www.mpfr.org/ -config BR2_PACKAGE_MPFR_HEADERS +config BR2_PACKAGE_LIBMPFR_HEADERS bool "mpfr headers for target" default n - depends on BR2_PACKAGE_MPFR - select BR2_PACKAGE_GMP_HEADERS + depends on BR2_PACKAGE_LIBMPFR + select BR2_PACKAGE_LIBGMP_HEADERS help Install the mpfr headers for the target. diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 096937248..dd940f291 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -22,7 +22,7 @@ $(DL_DIR)/$(MPFR_SOURCE): $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE) -mpfr-source: $(DL_DIR)/$(MPFR_SOURCE) +libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - @@ -81,20 +81,20 @@ $(STAGING_DIR)/lib/$(MPFR_BINARY): $(MPFR_DIR)/.libs/$(MPFR_BINARY) $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION): $(STAGING_DIR)/lib/$(MPFR_BINARY) cp -a $(STAGING_DIR)/lib/libmpfr.so* $(STAGING_DIR)/lib/libmpfr.a \ $(TARGET_DIR)/lib/ -ifeq ($(BR2_PACKAGE_MPFR_HEADERS),y) +ifeq ($(BR2_PACKAGE_LIBMPFR_HEADERS),y) cp -a $(STAGING_DIR)/include/mpfr.h $(STAGING_DIR)/include/mpf2mpfr.h \ $(TARGET_DIR)/usr/include/ endif $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libmpfr.so* \ $(TARGET_DIR)/lib/libmpfr.a -mpfr: uclibc $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) +libmpfr: uclibc libgmp $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) -mpfr-clean: +libmpfr-clean: rm -f $(TARGET_DIR)/lib/$(MPFR_BINARY) -$(MAKE) -C $(MPFR_DIR) clean -mpfr-dirclean: +libmpfr-dirclean: rm -rf $(MPFR_DIR) ############################################################# @@ -102,6 +102,6 @@ mpfr-dirclean: # Toplevel Makefile options # ############################################################# -ifeq ($(strip $(BR2_PACKAGE_MPFR)),y) -TARGETS+=mpfr +ifeq ($(strip $(BR2_PACKAGE_LIBMPFR)),y) +TARGETS+=libmpfr endif |