add libogg

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

diff --git a/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile
index eaa45fc..3d5d745 100644 (file)
--- a/openwrt/package/libgd/Makefile
+++ b/openwrt/package/libgd/Makefile
@@ -18,16 +18,13 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGD,libgd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-
 $(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) \
@@ -51,16 +48,22 @@ $(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 $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
+       touch $@
 
 $(IPKG_LIBGD):
        install -d -m0755 $(IDIR_LIBGD)/usr/lib
@@ -76,14 +79,16 @@ $(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