reorganize/rationalize/format package menuconfig,

[openwrt-10.03/.git] / package / libgd / Makefile

diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index c180dd81510865869feb84e5f822cb7f9175d7df..aedb0af117c2235dbb0ecaa6e733867a0aa70f6e 100644 (file)
--- 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 $@
 
@@ -88,6 +90,6 @@ uninstall-dev:
                $(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