X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d2368294409098f0d160f5cf432c149aa3bd858f..bf0d0855df44c49b8a90fbd43dab87eace5ac1a0:/package/libgd/Makefile?ds=inline diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 50ca47f80..aedb0af11 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -22,11 +22,9 @@ $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \ - sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ - sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -50,8 +48,12 @@ $(PKG_BUILD_DIR)/.configured: --enable-shared \ --enable-static \ --disable-rpath \ + --with-gnu-ld \ --without-x \ + --without-freetype \ + --without-jpeg \ --with-png=$(STAGING_DIR)/usr \ + --without-xpm \ ) touch $@ @@ -77,15 +79,17 @@ $(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.built cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ + touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgd.so uninstall-dev: rm -rf \ - $(STAGING_DIR)/usr/include/entities.h \ - $(STAGING_DIR)/usr/include/gd*.h \ - $(STAGING_DIR)/usr/lib/libgd.{a,so*} + $(STAGING_DIR)/usr/bin/gdlib-config \ + $(STAGING_DIR)/usr/include/entities.h \ + $(STAGING_DIR)/usr/include/gd*.h \ + $(STAGING_DIR)/usr/lib/libgd.{a,so*} \ -compile: install-dev -clean: uninstall-dev +compile-targets: install-dev +clean-targets: uninstall-dev